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.

Backports: r901557 (overlooked when proposed for backport)

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

diff --git a/server/core.c b/server/core.c
index d7081fd1a764152cf5d9a95208ef680b49a1cf97..349e8f2cee414a170485cf6caf2b4fd9ba14e77c 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -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;

diff --git a/server/main.c b/server/main.c
index 384423d9490b91b78f614e1c1e2baf197217d25d..847849038964b4f22f533a6e260510602a73e068 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -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;