svn commit: r901557 - in /httpd/httpd/trunk/server: core.c main.c

[wr...@apache.org]

Author: wrowe
Date: Thu Jan 21 06:31:47 2010
New Revision: 901557

URL: http://svn.apache.org/viewvc?rev=901557&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/server/core.c
    httpd/httpd/trunk/server/main.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=901557&r1=901556&r2=901557&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Thu Jan 21 06:31:47 2010
@@ -94,6 +94,9 @@
 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;
 

Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=901557&r1=901556&r2=901557&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Thu Jan 21 06:31:47 2010
@@ -440,9 +440,6 @@
     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;