Mailing List Archive

rse 98/03/05 02:21:27

Modified: src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
Shuffle #includes and #defines into private header file
to have all this stuff at a single point for clear layout.

Revision Changes Path
1.84 +0 -33 apache-1.3/src/modules/standard/mod_rewrite.c

Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mod_rewrite.c 1998/03/05 07:53:59 1.83
+++ mod_rewrite.c 1998/03/05 10:21:24 1.84
@@ -85,37 +85,9 @@
*/


-
-
- /* from the underlaying Unix system ... */
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <time.h>
-#include <signal.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef WIN32
-#include "../../os/win32/passwd.h"
-#else
-#include <netinet/in.h>
-#endif
-
- /* from the Apache server ... */
-#include "httpd.h"
-#include "http_config.h"
-#include "http_request.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_vhost.h"
-
- /* now our own stuff ... */
#include "mod_rewrite.h"


-
/*
** +-------------------------------------------------------+
** | |
@@ -231,12 +203,7 @@
/* whether proxy module is available or not */
static int proxy_available;

- /* maximum nmatch parameter for regexec */
-#define MAX_NMATCH (10)
-
/* the txt mapfile parsing stuff */
-#define MAPFILE_PATTERN "^([^ \t]+)[ \t]+([^ \t]+).*$"
-#define MAPFILE_OUTPUT "$1,$2"
static regex_t *lookup_map_txtfile_regexp = NULL;
static regmatch_t lookup_map_txtfile_regmatch[MAX_NMATCH];




1.45 +29 -1 apache-1.3/src/modules/standard/mod_rewrite.h

Index: mod_rewrite.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mod_rewrite.h 1998/03/04 13:55:09 1.44
+++ mod_rewrite.h 1998/03/05 10:21:25 1.45
@@ -1,4 +1,3 @@
-
/* ====================================================================
* Copyright (c) 1996-1998 The Apache Group. All rights reserved.
*
@@ -90,6 +89,30 @@
*/


+ /* Include from the underlaying Unix system ... */
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <time.h>
+#include <signal.h>
+#include <errno.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef WIN32
+#include "../../os/win32/passwd.h"
+#else
+#include <netinet/in.h>
+#endif
+
+ /* Include from the Apache server ... */
+#include "httpd.h"
+#include "http_config.h"
+#include "http_request.h"
+#include "http_core.h"
+#include "http_log.h"
+#include "http_vhost.h"
+
/* The NDBM support:
* We support only NDBM files.
* But we have to stat the file for the mtime,
@@ -207,6 +230,11 @@
#endif

#define MAX_ENV_FLAGS 5
+
+#define MAX_NMATCH 10
+
+#define MAPFILE_PATTERN "^([^ \t]+)[ \t]+([^ \t]+).*$"
+#define MAPFILE_OUTPUT "$1,$2"


/*