Code updates to allow Mod_Rewrite and Mod_Auth_DBM to build on NetWare

Submitted by: G�nter Knauf <gk@gknw.de>

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

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index ccad11223ef2358894f754f05fa862219a633764..254e81499637c56fb7a3fa7f1c96b846fa9b2a5f 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -114,7 +114,7 @@
 #include "http_protocol.h"
 #include "mod_rewrite.h"
 
-#if !defined(OS2) && !defined(WIN32) && !defined(BEOS)
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS)  && !defined(NETWARE)
 #include "unixd.h"
 #endif
 
@@ -4154,13 +4154,6 @@ static char *find_char_in_brackets(char *s, int c, int left, int right)
 **
 */
 
-#ifdef NETWARE
-int main(int argc, char *argv[]) 
-{
-    ExitThread(TSR_THREAD, 0);
-}
-#endif
-
     /* the apr_table_t of commands we provide */
 static const command_rec command_table[] = {
     AP_INIT_FLAG(    "RewriteEngine",   cmd_rewriteengine,  NULL, OR_FILEINFO,

diff --git a/os/netware/pre_nw.h b/os/netware/pre_nw.h
index 6a3d99c45d9f8016c9fad5411d812534e87d3c92..ce5ebe4833f37fd8f56b45280f4831c8edb393f3 100644 (file)
--- a/os/netware/pre_nw.h
+++ b/os/netware/pre_nw.h
@@ -37,6 +37,12 @@ typedef unsigned long long uint64_t;
 #define __int64 long long
 #endif
 
+/* Don't use the DBM rewrite map for mod_rewrite */
+#define NO_DBM_REWRITEMAP
+
+/* Allow MOD_AUTH_DBM to use APR */
+#define AP_AUTH_DBM_USE_APR
+
 #endif