From: Ryan Bloom <rbb@apache.org>
Date: Tue, 18 Jan 2000 23:41:56 +0000 (+0000)
Subject: This is a huge change to the configure system.  Basically, this name space
X-Git-Tag: 1.3.13~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a4fae036f14a1f34bdfa29d0627b631aa6d286;p=thirdparty%2Fapache%2Fhttpd.git

This is a huge change to the configure system.  Basically, this name space
protects most, if not all, of the Apache macros.   This has been tested on
Linux using all of the Unix MPM's.  The biggest push was that Apache's
httpd.h header file can no longer include the ap_config.h file.  Most of the
other files include this themselves now.
Submitted by:	Ryan Bloom and Manoj Kasichainula


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

diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c
index 08639abfd1d..04645985516 100644
--- a/modules/aaa/mod_access.c
+++ b/modules/aaa/mod_access.c
@@ -62,11 +62,13 @@
  * 
  */
 
+#include "apr_network_io.h"
 #include "httpd.h"
 #include "http_core.h"
 #include "http_config.h"
 #include "http_log.h"
 #include "http_request.h"
+#include <string.h>
 
 enum allowdeny_type {
     T_ENV,
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 9159eaa7bde..967a58c471b 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -125,7 +125,6 @@
 #include "http_request.h"
 #include "http_log.h"
 #include "http_protocol.h"
-#include "ap_config.h"
 #include "ap_ctype.h"
 #include "util_uri.h"
 #include "util_md5.h"
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index 9fa543de956..d622c93de59 100644
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -1,3 +1,4 @@
+#include "ap_mmn.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_connection.h"
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index c48241bb101..2931d805e2d 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -92,6 +92,9 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "util_script.h"
+#include <sys/stat.h>
+#include <string.h>
+#include <pwd.h>
 #endif
 
 #define STARTING_SEQUENCE "<!--#"
diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c
index f8c4ce5e864..0dd6fed3b43 100644
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -63,6 +63,8 @@
 #include "http_main.h"
 #include "http_request.h"
 
+#define ASIS_MAGIC_TYPE "httpd/send-as-is"
+
 static int asis_handler(request_rec *r)
 {
     ap_file_t *f = NULL;
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 47ed08791a0..7f3944cad8e 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -73,6 +73,7 @@
 #include "http_main.h"
 #include "util_script.h"
 #include "apr_fnmatch.h"
+#include <string.h>
 
 module MODULE_VAR_EXPORT autoindex_module;
 
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 30179555010..56b4d0f656f 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -77,6 +77,8 @@
 #include "http_log.h"
 #include "util_script.h"
 #include "http_conf_globals.h"
+#include <sys/stat.h>
+#include <string.h>
 
 module MODULE_VAR_EXPORT cgi_module;
 
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 0738e281a9b..5cacf4561c6 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -55,18 +55,18 @@
  *
  */
 
-#define CORE_PRIVATE
 #include "httpd.h"
 #include "http_config.h"
 #include "http_core.h"
 #include "http_protocol.h"
 #include "mpm_status.h"
-#include <time.h>
 
 #ifndef DEFAULT_TIME_FORMAT 
 #define DEFAULT_TIME_FORMAT "%A, %d-%b-%Y %H:%M:%S %Z"
 #endif
 
+#define STATUS_MAGIC_TYPE "application/x-httpd-status"
+
 module MODULE_VAR_EXPORT status_module;
 
 static int print_status_value(void *data, const char *key, const char *val)
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index cb31a02651c..bf61c0ae084 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -69,6 +69,8 @@
 #include "http_log.h"
 #include "http_request.h"
 
+#include <string.h>
+
 typedef struct handlers_info {
     char *name;
 } handlers_info;
@@ -248,7 +250,7 @@ static void mime_post_config(ap_context_t *p, ap_context_t *plog, ap_context_t *
     ap_status_t status;
 
     if (!types_confname)
-        types_confname = TYPES_CONFIG_FILE;
+        types_confname = AP_TYPES_CONFIG_FILE;
 
     types_confname = ap_server_root_relative(p, types_confname);
 
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 885b7c081ea..f87139fbe83 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -152,7 +152,7 @@ static int handle_dir(request_rec *r)
 	num_names = d->index_names->nelts;
     }
     else {
-	dummy_ptr[0] = DEFAULT_INDEX;
+	dummy_ptr[0] = AP_DEFAULT_INDEX;
 	names_ptr = dummy_ptr;
 	num_names = 1;
     }
diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c
index a97dbaa3455..579c2f4f13b 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -99,6 +99,7 @@
 #include "http_main.h"
 #include "http_log.h"
 #include "util_script.h"
+#include <string.h>
 
 #define IMAP_MAGIC_TYPE "application/x-httpd-imap"
 #define MAXVERTS 100
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index dc569776e08..531720e242d 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -62,6 +62,7 @@
  * rst
  */
 
+#include "apr_file_io.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
@@ -69,6 +70,9 @@
 #include "http_core.h"
 #include "http_log.h"
 #include "util_script.h"
+#include <string.h>
+
+#define MAP_FILE_MAGIC_TYPE "application/x-type-map"
 
 /* Commands --- configuring document caching on a per (virtual?)
  * server basis... 
@@ -1442,15 +1446,15 @@ static void set_language_quality(negotiation_state *neg, var_rec *variant)
 
 static float find_content_length(negotiation_state *neg, var_rec *variant)
 {
-    struct stat statb;
+    ap_finfo_t statb;
 
     if (variant->bytes == 0) {
         char *fullname = ap_make_full_path(neg->pool, neg->dir_name,
                                            variant->file_name);
 
-        if (stat(fullname, &statb) >= 0) {
+        if (ap_stat(&statb, fullname, neg->pool) == APR_SUCCESS) {
             /* Note, precision may be lost */
-            variant->bytes = (float) statb.st_size;
+            variant->bytes = (float) statb.size;
         }
     }
 
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 877bbf90826..fc95b3715fe 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -93,6 +93,12 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
+#include <pwd.h>
+
+/* The default directory in user's home dir */
+#ifndef DEFAULT_USER_DIR
+#define DEFAULT_USER_DIR "public_html"
+#endif
 
 module userdir_module;
 
diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index 287ba61cb04..3c8c2144782 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -101,6 +101,7 @@
 #include "httpd.h"
 #include "http_config.h"
 #include "http_request.h"
+#include <stdlib.h>
 
 typedef struct {
     ap_table_t *vars;