Allocate memory from the temp_pool rather than the stack to avoid blowing fixed lengt...

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

diff --git a/os/netware/pre_nw.h b/os/netware/pre_nw.h
index 910ab57cdae2f82dc54720f19a56024dd324c6e0..0f2a9327a9809f3340fa9fd4c6671a1f1d2e4ea5 100644 (file)
--- a/os/netware/pre_nw.h
+++ b/os/netware/pre_nw.h
@@ -60,6 +60,9 @@
 /* Allow MOD_AUTH_DBM to use APR */
 #define AP_AUTH_DBM_USE_APR
 
+/* Restrict the number of nested includes */
+#define AP_MAX_INCLUDE_DEPTH    48
+
 #endif
 
 

diff --git a/server/config.c b/server/config.c
index 277aaef30a880b14b4601035a81a55a5f53524dd..5b484926442801d3ba2d3fbb5a10fad0fe16d14d 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1100,7 +1100,7 @@ AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
 {
     ap_directive_t *current = *conftree;
     ap_directive_t *curr_parent = NULL;
-    char l[MAX_STRING_LEN];
+    char *l = apr_palloc (temp_pool, MAX_STRING_LEN);
     const char *errmsg;
 
     if (current != NULL) {