httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r997396 - in /httpd/httpd/branches/2.2.x/server: core.c main.c
Date Wed, 15 Sep 2010 16:59:56 GMT
Author: wrowe
Date: Wed Sep 15 16:59:56 2010
New Revision: 997396

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

Modified:
    httpd/httpd/branches/2.2.x/server/core.c
    httpd/httpd/branches/2.2.x/server/main.c

Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/core.c?rev=997396&r1=997395&r2=997396&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Wed Sep 15 16:59:56 2010
@@ -96,6 +96,9 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_core
 /* 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;

Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/main.c?rev=997396&r1=997395&r2=997396&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Wed Sep 15 16:59:56 2010
@@ -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;



Mime
View raw message