cvs commit: apache/src mod_rewrite.c
rse 97/07/29 08:17:56
Modified:src mod_rewrite.c
Log:
Oooppss... the trivial enhancements patch went in last time, too.
This one was currently not voted +1. Hmmm.. better we back it out and
commit it later.
Revision ChangesPath
1.44 +1 -4 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mod_rewrite.c 1997/07/29 15:11:50 1.43
+++ mod_rewrite.c 1997/07/29 15:17:55 1.44
@@ -1784,10 +1784,7 @@
rc = (compare_lexicography(input, p-pattern+1) == -1 ? 1 : 0);
}
else if (strlen(p-pattern) 1 *(p-pattern) == '=') {
-if (strcmp(p-pattern+1, \\) == 0)
-rc = (*input == '\0');
-else
-rc = (strcmp(input, p-pattern+1) == 0 ? 1 : 0);
+rc = (strcmp(input, p-pattern+1) == 0 ? 1 : 0);
}
else {
/* it is really a regexp pattern, so apply it */
cvs commit: apache/src mod_rewrite.c mod_rewrite.h
rse 97/07/26 04:33:46
Modified:src mod_rewrite.c mod_rewrite.h
Log:
added missing static qualifier.
Revision ChangesPath
1.40 +1 -1 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_rewrite.c 1997/07/25 15:28:33 1.39
+++ mod_rewrite.c 1997/07/26 11:33:44 1.40
@@ -3322,7 +3322,7 @@
**
*/
-int compare_lexicography(char *cpNum1, char *cpNum2)
+static int compare_lexicography(char *cpNum1, char *cpNum2)
{
int i;
int n1, n2;
1.28 +1 -1 apache/src/mod_rewrite.h
Index: mod_rewrite.h
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_rewrite.h 1997/07/18 09:48:06 1.27
+++ mod_rewrite.h 1997/07/26 11:33:45 1.28
@@ -394,7 +394,7 @@
static void fd_unlock(int fd);
/* Lexicographic Comparison */
-int compare_lexicography(char *cpNum1, char *cpNum2);
+static int compare_lexicography(char *cpNum1, char *cpNum2);
#endif /* _MOD_REWRITE_H */
cvs commit: apache/src mod_rewrite.c
dgaudet 97/07/26 19:10:41 Modified:src mod_rewrite.c Log: add static to cachep. (Ralf if it's exported for a reason I can't see then maybe change it to rewrite_cachep) Revision ChangesPath 1.41 +1 -1 apache/src/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mod_rewrite.c 1997/07/26 11:33:44 1.40 +++ mod_rewrite.c 1997/07/27 02:10:39 1.41 @@ -217,7 +217,7 @@ }; /* the cache */ -cache *cachep; +static cache *cachep; /* whether proxy module is available or not */ static int proxy_available;
cvs commit: apache/src mod_rewrite.c
rse 97/07/24 08:16:49 Modified:src mod_rewrite.c Log: bugfix for logfile which missed the negation character. Revision ChangesPath 1.38 +3 -1 apache/src/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- mod_rewrite.c 1997/07/24 04:38:11 1.37 +++ mod_rewrite.c 1997/07/24 15:16:46 1.38 @@ -1795,7 +1795,9 @@ if (p-flags CONDFLAG_NOTMATCH) rc = !rc; -rewritelog(r, 4, RewriteCond: input='%s' pattern='%s' = %s, input, p-pattern, rc ? matched : not-matched); +rewritelog(r, 4, RewriteCond: input='%s' pattern='%s%s' = %s, + input, (p-flags CONDFLAG_NOTMATCH ? ! : ), + p-pattern, rc ? matched : not-matched); /* end just return the result */ return rc;
cvs commit: apache/src mod_rewrite.c
rse 97/07/21 10:26:52
Modified:src mod_rewrite.c
Log:
Fixed coding style to be just consistent with the remaining stuff
in this part of the source...
Revision ChangesPath
1.36 +2 -2 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C3 -r1.35 -r1.36
*** mod_rewrite.c 1997/07/21 05:53:50 1.35
--- mod_rewrite.c 1997/07/21 17:26:50 1.36
***
*** 2372,2378
if (conn-user == NULL) {
ruser = -;
}
! else if (strlen (conn-user) != 0) {
ruser = conn-user;
}
else {
--- 2372,2378
if (conn-user == NULL) {
ruser = -;
}
! else if (strlen(conn-user) != 0) {
ruser = conn-user;
}
else {
***
*** 3235,3241
static int is_proxy_available(server_rec *s)
{
! return find_linked_module (mod_proxy) != NULL;
}
--- 3235,3241
static int is_proxy_available(server_rec *s)
{
! return (find_linked_module(mod_proxy) != NULL);
}
cvs commit: apache/src mod_rewrite.c mod_rewrite.h
rse 97/07/13 02:04:53
Modified:src mod_rewrite.c mod_rewrite.h
Log:
mod_rewrite gift procedure, phase 1:
Incorporation of the latest official release 3.0.9
(cleanup follows the next days in phase 2)
Reviewed by: Marc Slemko, Randy Terbush
Revision ChangesPath
1.32 +79 -15apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C3 -r1.31 -r1.32
*** mod_rewrite.c 1997/06/22 03:45:00 1.31
--- mod_rewrite.c 1997/07/13 09:04:51 1.32
***
*** 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.6 (15-Jun-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
--- 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.9 (11-Jul-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***
*** 1116,1121
--- 1116,1122
char *prefix;
int l;
int n;
+ char *ofilename;
dconf = (rewrite_perdir_conf *)get_module_config(r-per_dir_config,
rewrite_module);
***
*** 1149,1154
--- 1150,1162
}
/*
+ * remember the current filename before rewriting for later check
+ * to prevent deadlooping because of internal redirects
+ * on final URL/filename which can be equal to the inital one.
+ */
+ ofilename = r-filename;
+
+ /*
* now apply the rules ...
*/
if (apply_rewrite_list(r, dconf-rewriterules, dconf-directory)) {
***
*** 1262,1267
--- 1270,1287
if (r-filename[0] != '/')
return BAD_REQUEST;
+ /* Check for deadlooping:
+ * At this point we KNOW that at least one rewriting
+ * rule was applied, but when the resulting URL is
+ * the same as the initial URL, we are not allowed to
+ * use the following internal redirection stuff because
+ * this would lead to a deadloop.
+ */
+ if (strcmp(r-filename, ofilename) == 0) {
+ rewritelog(r, 1, [per-dir %s] initial URL equal rewritten
URL: %s [IGNORING REWRITE], dconf-directory, r-filename);
+ return OK;
+ }
+
/* if there is a valid base-URL then substitute
the per-dir prefix with this base-URL if the
current filename still is inside this per-dir
***
*** 1503,1510
return 0; /* if any condition fails this complete rule fails */
/* if this is a pure matching rule we return immediately */
! if (strcmp(output, -) == 0)
return 2;
/* if this is a forced proxy request ... */
if (p-flags RULEFLAG_PROXY) {
--- 1523,1539
return 0; /* if any condition fails this complete rule fails */
/* if this is a pure matching rule we return immediately */
! if (strcmp(output, -) == 0) {
! /* but before we set the env variables... */
! for (i = 0; p-env[i] != NULL; i++) {
! strncpy(env2, p-env[i], sizeof(env2)-1);
! EOS_PARANOIA(env2);
! strncpy(env, pregsub(r-pool, env2, uri, regexp-re_nsub+1,
regmatch), sizeof(env)-1);/* substitute in output */
! EOS_PARANOIA(env);
! add_env_variable(r, env);
! }
return 2;
+ }
/* if this is a forced proxy request ... */
if (p-flags RULEFLAG_PROXY) {
***
*** 1624,1629
--- 1653,1659
and the current URL still is not a fully qualified one we
finally prefix it with http[s]://ourname explicitly */
if (flags RULEFLAG_FORCEREDIRECT) {
+ r-status = p-forced_responsecode;
if ( !(strlen(r-filename) 7
strncmp(r-filename, http://;, 7) == 0)
!(strlen(r-filename) 8
***
*** 1659,1665
else
rewritelog(r, 2, [per-dir %s] prepare forced redirect
%s - %s, perdir, r-filename, newuri);
r-filename = pstrdup(r-pool, newuri);
- r-status =
cvs commit: apache/src mod_rewrite.c mod_rewrite.h
dgaudet 97/04/11 21:19:51
Modified:src mod_rewrite.c mod_rewrite.h
Log:
Sync to 3.0.3
Reviewed by: Dean
Submitted by: Ralf
Revision ChangesPath
1.25 +12 -12apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** mod_rewrite.c 1997/03/29 01:55:57 1.24
--- mod_rewrite.c 1997/04/12 04:19:49 1.25
***
*** 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.2 (26-Mar-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
--- 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.3 (08-Apr-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***
*** 878,891
/* add the canonical URI of this URL */
thisserver = r-server-server_hostname;
#ifdef APACHE_SSL
! if (((!r-connection-client-ssl) (r-server-port == 80)) ||
((r-connection-client-ssl) (r-server-port == 443)))
#else
! if (r-server-port == 80)
#endif
thisport = ;
else {
! ap_snprintf(buf, sizeof(buf), :%d, r-server-port);
thisport = pstrdup(r-pool, buf);
}
thisurl = table_get(r-subprocess_env, ENVVAR_SCRIPT_URL);
--- 878,891
/* add the canonical URI of this URL */
thisserver = r-server-server_hostname;
#ifdef APACHE_SSL
! if (((!r-connection-client-ssl) (r-server-port ==
DEFAULT_PORT)) ||
((r-connection-client-ssl) (r-server-port == 443)))
#else
! if (r-server-port == DEFAULT_PORT)
#endif
thisport = ;
else {
! ap_snprintf(buf, sizeof(buf), :%u, r-server-port);
thisport = pstrdup(r-pool, buf);
}
thisurl = table_get(r-subprocess_env, ENVVAR_SCRIPT_URL);
***
*** 1618,1631
strncmp(r-filename, ftp://;, 6) == 0)) {
#ifdef APACHE_SSL
! if ((!r-connection-client-ssl r-server-port == 80)
||
( r-connection-client-ssl r-server-port == 443)
)
#else
! if (r-server-port == 80)
#endif
port[0] = '\0';
else
! ap_snprintf(port, sizeof(port), :%d, r-server-port);
if (r-filename[0] == '/')
#ifdef APACHE_SSL
ap_snprintf(newuri, sizeof(newuri), %s://%s%s%s,
http_method(r), r-server-server_hostname, port, r-filename);
--- 1618,1631
strncmp(r-filename, ftp://;, 6) == 0)) {
#ifdef APACHE_SSL
! if ((!r-connection-client-ssl r-server-port ==
DEFAULT_PORT) ||
( r-connection-client-ssl r-server-port == 443)
)
#else
! if (r-server-port == DEFAULT_PORT)
#endif
port[0] = '\0';
else
! ap_snprintf(port, sizeof(port), :%u, r-server-port);
if (r-filename[0] == '/')
#ifdef APACHE_SSL
ap_snprintf(newuri, sizeof(newuri), %s://%s%s%s,
http_method(r), r-server-server_hostname, port, r-filename);
***
*** 1806,1812
static void reduce_uri(request_rec *r)
{
char *cp;
! short port;
char *portp;
char *hostp;
char *url;
--- 1806,1812
static void reduce_uri(request_rec *r)
{
char *cp;
! unsigned short port;
char *portp;
char *hostp;
char *url;
***
*** 1860,1866
EOS_PARANOIA(host);
*cp = '/';
/* set port */
! port = 80;
/* set remaining url */
url = cp;
}
--- 1860,1866
EOS_PARANOIA(host);
*cp = '/';
/* set port */
! port = DEFAULT_PORT;
/* set remaining url */
url = cp;
}
***
*** 1869,1875
strncpy(host, hostp, sizeof(host)-1);
EOS_PARANOIA(host);
/* set port */
! port = 80;
/* set remaining url */
url = /;
}
--- 1869,1875
strncpy(host, hostp, sizeof(host)-1);
cvs commit: apache/src mod_rewrite.c
marc97/02/07 18:28:33
Modified:src mod_rewrite.c
Log:
Make prototypes agree in mod_rewrite.c and .h.
Reviewed by: Ralf S. Engelschall, Dean Gaudet, Jim Jagielski
Revision ChangesPath
1.19 +1 -1 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** mod_rewrite.c 1997/02/06 05:16:56 1.18
--- mod_rewrite.c 1997/02/08 02:28:32 1.19
***
*** 3148,3154
**
*/
! int is_proxy_available(server_rec *s)
{
extern module *preloaded_modules[];
command_rec *c;
--- 3148,3154
**
*/
! static int is_proxy_available(server_rec *s)
{
extern module *preloaded_modules[];
command_rec *c;
cvs commit: apache/src mod_rewrite.c
marc97/02/05 21:16:57
Modified:src mod_rewrite.c
Log:
Bug fix for buffer overflow patches.
Submitted by: [EMAIL PROTECTED]
Reviewed by: Marc Slemko, Ralf Engelschall
Revision ChangesPath
1.18 +1 -1 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C3 -r1.17 -r1.18
*** mod_rewrite.c 1997/02/03 02:56:56 1.17
--- mod_rewrite.c 1997/02/06 05:16:56 1.18
***
*** 2165,2171
char buf[MAX_STRING_LEN];
dbmkey.dptr = key;
! dbmkey.dsize = (strlen(key) sizeof(buf) - 1 : strlen(key) ?
sizeof(buf)-1);
if ((dbmfp = dbm_open(file, O_RDONLY, 0666)) != NULL) {
dbmval = dbm_fetch(dbmfp, dbmkey);
if (dbmval.dptr != NULL) {
--- 2165,2171
char buf[MAX_STRING_LEN];
dbmkey.dptr = key;
! dbmkey.dsize = (strlen(key) sizeof(buf) - 1 ? strlen(key) :
sizeof(buf)-1);
if ((dbmfp = dbm_open(file, O_RDONLY, 0666)) != NULL) {
dbmval = dbm_fetch(dbmfp, dbmkey);
if (dbmval.dptr != NULL) {
cvs commit: apache/src mod_rewrite.c
brian 97/02/02 18:56:58
Modified:src mod_rewrite.c
Log:
Reviewed by: Randy Terbush, Marc Slemko, Roy Fielding
Submitted by: Ralf S. Engelschall [EMAIL PROTECTED]
Bring mod_rewrite up to version 3.0.0.
Revision ChangesPath
1.17 +403 -199 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C3 -r1.16 -r1.17
*** mod_rewrite.c 1997/01/29 23:51:37 1.16
--- mod_rewrite.c 1997/02/03 02:56:56 1.17
***
*** 1,3
--- 1,4
+
/*
* Copyright (c) 1996,1997 The Apache Group. All rights reserved.
*
***
*** 60,66
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 2.3.10 (20-12-1996)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
--- 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.0 (01-02-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***
*** 80,91
** The documentation and latest release can be found on
** http://www.engelschall.com/sw/mod_rewrite/
**
! ** Copyright (c) 1996 Ralf S. Engelschall, All rights reserved.
**
** Written for The Apache Group by
** Ralf S. Engelschall
** [EMAIL PROTECTED]
! ** http://www.engelschall.com/
*/
--- 81,92
** The documentation and latest release can be found on
** http://www.engelschall.com/sw/mod_rewrite/
**
! ** Copyright (c) 1996-1997 Ralf S. Engelschall, All rights reserved.
**
** Written for The Apache Group by
** Ralf S. Engelschall
** [EMAIL PROTECTED]
! ** www.engelschall.com
*/
***
*** 96,101
--- 97,105
#include stdarg.h
#include time.h
#include signal.h
+ #include errno.h
+ #include pwd.h
+ #include grp.h
#include sys/types.h
#include sys/stat.h
#include netinet/in.h
***
*** 110,120
/* now our own stuff ... */
#include mod_rewrite.h
- #ifdef __EMX__
- /* OS/2 dosen't support links. */
- #define S_ISLNK
- #endif
-
--- 114,119
***
*** 131,137
**
** our interface to the Apache server kernel
**
! ** keep in mind:
**
** o Runtime logic of a request is as following:
**
--- 130,136
**
** our interface to the Apache server kernel
**
! ** keep in mind:
**
** o Runtime logic of a request is as following:
**
***
*** 228,241
/* the txt mapfile parsing stuff */
#define MAPFILE_PATTERN ^([^ ]+) +([^ ]+).*$
- #ifdef HAS_APACHE_REGEX_LIB
#define MAPFILE_OUTPUT $1,$2
static regex_t *lookup_map_txtfile_regexp = NULL;
static regmatch_t lookup_map_txtfile_regmatch[10];
- #else
- #define MAPFILE_OUTPUT \\1,\\2
- static regexp *lookup_map_txtfile_regexp = NULL;
- #endif
--- 227,235
***
*** 356,362
**
*/
! static _const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf
*dconf, int flag)
{
rewrite_server_conf *sconf;
--- 350,356
**
*/
! static const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf
*dconf, int flag)
{
rewrite_server_conf *sconf;
***
*** 369,378
return NULL;
}
! static _const char *cmd_rewriteoptions(cmd_parms *cmd, rewrite_perdir_conf
*dconf, char *option)
{
rewrite_server_conf *sconf;
! _const char *err;
sconf = (rewrite_server_conf
*)get_module_config(cmd-server-module_config, rewrite_module);
if (cmd-path == NULL) /* is server command */
--- 363,372
return NULL;
}
! static const char *cmd_rewriteoptions(cmd_parms *cmd, rewrite_perdir_conf
*dconf, char *option)
{
rewrite_server_conf *sconf;
! const char *err;
sconf = (rewrite_server_conf
*)get_module_config(cmd-server-module_config, rewrite_module);
if (cmd-path == NULL) /* is server command */
***
*** 383,389
return err;
}
! static _const char *cmd_rewriteoptions_setoption(pool *p, int *options,
char *name)
{
if (strcasecmp(name, inherit) == 0)
*options |=
cvs commit: apache/src mod_rewrite.c mod_rewrite.h
brian 96/12/11 16:36:12
Modified:src mod_rewrite.c mod_rewrite.h
Log:
Submitted by: [EMAIL PROTECTED]
bring mod_rewrite up to 2.3.9:
Patchlevel 8 (961211):
o Incorporated the const changes of the Apache Group to 2.3.5
into this release. But in a way to be backward compatible to Apache
1.1.1.
o Made gmtoff usage again workable in both 1.1.1 and 1.2
because the function was changed in Apache 1.2.
o Incorporated a patch to make mod_rewrite useable under Apache SSL,
i.e. with https:// URLs..
[Thanks to Michael Smith [EMAIL PROTECTED]]
o Added a check whether the proxy module is
compiled in or not. If not then [P] is forbidden. This is not 100%
safe, because it can still be turned off (ProxyRequests off) and then
[P] can lead to a core dump. But there is no trivial way to check if
the ProxyRequest is turned on or off. But the current variant of the
check is useful for people who use [P] but have no proxy module
even compiled in.
o Added some warning to the documentation that ProxyRequests must be
on when the [P] flag gets used.
[Thanks to Philip Peake [EMAIL PROTECTED] for hint]
o Fixed the installation description in the docs.
o Fixed a recently removed # char in mod_rewrite.h
Patchlevel 9:
The recently introduced proxy check code was syntactically correct but not
semantically. Hmmm.. lead to a core dump under 1.2b2. Thanks to Mark J. Cox
[EMAIL PROTECTED] for the hint.
Revision ChangesPath
1.10 +163 -27 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** mod_rewrite.c 1996/12/09 22:39:19 1.9
--- mod_rewrite.c 1996/12/12 00:36:09 1.10
***
*** 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 2.3.5 (09-10-1996)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
--- 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 2.3.9 (11-12-1996)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***
*** 87,93
** Written for The Apache Group by
** Ralf S. Engelschall
** [EMAIL PROTECTED]
! ** http://www.engelschall.com/~rse
*/
--- 87,93
** Written for The Apache Group by
** Ralf S. Engelschall
** [EMAIL PROTECTED]
! ** http://www.engelschall.com/
*/
***
*** 97,102
--- 97,103
#include string.h
#include stdarg.h
#include time.h
+ #include signal.h
#include sys/types.h
#include sys/stat.h
#include netinet/in.h
***
*** 111,119
/* now our own stuff ... */
#include mod_rewrite.h
-
/*
** +---+
** | |
--- 112,120
/* now our own stuff ... */
#include mod_rewrite.h
+
/*
** +---+
** | |
***
*** 216,224
NULL /* [#8] log a transaction */
};
! /* the common cache */
cache *cachep;
/* the txt mapfile parsing stuff */
#define MAPFILE_PATTERN ^([^ ]+) +([^ ]+).*$
#ifdef HAS_APACHE_REGEX_LIB
--- 217,228
NULL /* [#8] log a transaction */
};
! /* the cache */
cache *cachep;
+ /* whether proxy module is available or not */
+ static int proxy_available;
+
/* the txt mapfile parsing stuff */
#define MAPFILE_PATTERN ^([^ ]+) +([^ ]+).*$
#ifdef HAS_APACHE_REGEX_LIB
***
*** 349,355
**
*/
! static const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf
*dconf, int flag)
{
rewrite_server_conf *sconf;
--- 353,359
**
*/
! static _const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf
*dconf, int flag)
{
rewrite_server_conf *sconf;
***
*** 362,371
return NULL;
}
! static const char *cmd_rewriteoptions(cmd_parms *cmd,
cvs commit: apache/src mod_rewrite.c mod_rewrite.h
akosut 96/08/23 09:16:55 Modified:src mod_rewrite.c mod_rewrite.h Log: Update mod_rewrite to version 2.2 Submitted by: Ralf S. Engelschall Revision ChangesPath 1.4 +96 -70apache/src/mod_rewrite.c 1.5 +42 -24apache/src/mod_rewrite.h
