From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 21 Jan 2010 06:31:47 +0000 (+0000)
Subject: Design error; main.c is not part of the libhttpd, you can't forward
X-Git-Tag: 2.3.5~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27a6babb71b138dad3c24516db0c5f2be81019b7;p=thirdparty%2Fapache%2Fhttpd.git

Design error; main.c is not part of the libhttpd, you can't forward
referrence storage like this.  Move the variable allocation into the
ap_ library module.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@901557 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index 239c7840f9f..5f041a266c3 100644
--- a/server/core.c
+++ b/server/core.c
@@ -94,6 +94,9 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_core_output_filter_handle;
 AP_DECLARE_DATA ap_filter_rec_t *ap_content_length_filter_handle;
 AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle;
 
+/* Provide ap_document_root_check storage and default value = true */
+AP_DECLARE_DATA int ap_document_root_check = 1;
+
 /* magic pointer for ErrorDocument xxx "default" */
 static char errordocument_default;
 
diff --git a/server/main.c b/server/main.c
index 72c4158011c..d80ec62ade3 100644
--- a/server/main.c
+++ b/server/main.c
@@ -440,9 +440,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;