diff options
| author | Jeff Trawick <trawick@apache.org> | 2002-08-21 21:47:15 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2002-08-21 21:47:15 +0200 |
| commit | c14aa6528b4ba6cb1e1c151ed336b140325ced58 (patch) | |
| tree | 069f06c592302369773e2b667e9b88c65c7f20c2 /modules/mappers/mod_rewrite.h | |
| parent | Small fixes for SSLC (diff) | |
| download | apache2-c14aa6528b4ba6cb1e1c151ed336b140325ced58.tar.xz apache2-c14aa6528b4ba6cb1e1c151ed336b140325ced58.zip | |
Change mod_rewrite to use apr-util's dbm support for dbm rewrite
maps.
For now, the SDBM dbm flavor is always used. It won't be compatible
with dbm rewrite maps built for Apache 1.3 until apr-util supports
ndbm and mod_rewrite is changed to prefer ndbm over the built-in
sdbm.
PR: 10644
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96478 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | modules/mappers/mod_rewrite.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h index 7ffd8b7034..69a53dfa7a 100644 --- a/modules/mappers/mod_rewrite.h +++ b/modules/mappers/mod_rewrite.h @@ -116,6 +116,7 @@ #include "apr_thread_mutex.h" #endif #include "apr_optional.h" +#include "apr_dbm.h" #include "ap_config.h" /* Include from the Apache server ... */ @@ -134,28 +135,6 @@ #define VARY_KEY "rewrite-Vary" #define VARY_KEY_THIS "rewrite-Vary-this" - /* The NDBM support: - * We support only NDBM files. - * But we have to stat the file for the mtime, - * so we also need to know the file extension - */ -#ifndef NO_DBM_REWRITEMAP -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \ - && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 -#include <db1/ndbm.h> -#else -#include <ndbm.h> -#endif -#if defined(DBM_SUFFIX) -#define NDBM_FILE_SUFFIX DBM_SUFFIX -#elif defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM)) -#define NDBM_FILE_SUFFIX ".db" -#else -#define NDBM_FILE_SUFFIX ".pag" -#endif -#endif - - /* ** ** Some defines @@ -165,10 +144,6 @@ #define ENVVAR_SCRIPT_URL "SCRIPT_URL" #define ENVVAR_SCRIPT_URI "SCRIPT_URI" -#ifndef SUPPORT_DBM_REWRITEMAP -#define SUPPORT_DBM_REWRITEMAP 0 -#endif - #define REWRITE_FORCED_MIMETYPE_NOTEVAR "rewrite-forced-mimetype" #define CONDFLAG_NONE 1<<0 |