cvs commit: apache/src CHANGES mod_rewrite.c
dgaudet 98/01/13 16:05:01 Modified:.Tag: APACHE_1_2_X STATUS src Tag: APACHE_1_2_X CHANGES mod_rewrite.c Log: fix %3f problem in mod_rewrite Submitted by: Ralf Engelschall Reviewed by: Dean Gaudet, Roy Fielding Revision ChangesPath No revision No revision 1.1.2.13 +1 -30 apache/Attic/STATUS Index: STATUS === RCS file: /export/home/cvs/apache/Attic/STATUS,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -r1.1.2.12 -r1.1.2.13 --- STATUS1998/01/14 00:02:52 1.1.2.12 +++ STATUS1998/01/14 00:04:56 1.1.2.13 @@ -10,6 +10,7 @@ * Mark Bixby's MPE port patch * more #define wrappers from FreeBSD port * Dean's backport of the bputc()/chunking bugfix. +* Ralf's mod_rewrite bugfix for %3f Available: @@ -21,10 +22,6 @@ Alternate solution already in 1.3. Needs update against new mod_include. -* Ralf's mod_rewrite bugfix for %3f - see below - Status: Ralf +1, Dean +1, Roy +1 - * Marc's headers too big patch, repost it please? * backport of the netscape header padding fix, it's needed for 255 @@ -37,29 +34,3 @@ * Some fix for the bogus byte ranges bug. * fix os_escape_path() - -Stuff from Ralf: - -* The following 1.2.5-adjusted bugfix for mod_rewrite.c - which fixes the Location: http://host/bar%3fquery; problem (the ? - is escaped but have not!) - -Index: mod_rewrite.c -=== -RCS file: /e/apache/REPOS/apache/src/mod_rewrite.c,v -retrieving revision 1.28.2.3 -diff -u -r1.28.2.3 mod_rewrite.c ---- mod_rewrite.c 1997/08/17 20:35:49 1.28.2.3 -+++ mod_rewrite.c 1997/10/28 11:53:52 -@@ -1590,6 +1590,7 @@ - } - rewritelog(r, 2, [per-dir %s] redirect %s - %s, perdir, r-filename, newuri); - r-filename = pstrdup(r-pool, newuri); -+splitout_queryargs(r, p-flags RULEFLAG_QSAPPEND); - r-status = p-forced_responsecode; - return 1; - } - - For 1.3 this bugfix is different and already replaced by the new patch - replacing the complete rewriting engine I'll post these days . - No revision No revision 1.286.2.65 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.64 retrieving revision 1.286.2.65 diff -u -r1.286.2.64 -r1.286.2.65 --- CHANGES 1998/01/14 00:02:55 1.286.2.64 +++ CHANGES 1998/01/14 00:04:58 1.286.2.65 @@ -1,5 +1,8 @@ Changes with Apache 1.2.6 + *) mod_rewrite would not handle %3f properly in some situations. + [Ralf Engelschall] + *) Apache could generate improperly chunked HTTP/1.1 responses when the bputc() or rputc() functions were used by modules (such as mod_include). [Dean Gaudet] 1.28.2.4 +1 -0 apache/src/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v retrieving revision 1.28.2.3 retrieving revision 1.28.2.4 diff -u -r1.28.2.3 -r1.28.2.4 --- mod_rewrite.c 1997/08/17 20:35:49 1.28.2.3 +++ mod_rewrite.c 1998/01/14 00:04:59 1.28.2.4 @@ -1590,6 +1590,7 @@ } rewritelog(r, 2, [per-dir %s] redirect %s - %s, perdir, r-filename, newuri); r-filename = pstrdup(r-pool, newuri); +splitout_queryargs(r, p-flags RULEFLAG_QSAPPEND); r-status = p-forced_responsecode; return 1; }
cvs commit: apache/src CHANGES mod_rewrite.c
rse 97/08/17 13:35:52
Modified:src Tag: APACHE_1_2_X CHANGES mod_rewrite.c
Log:
Fixed proxy-pass-through feature.
Submitted by: Marc Slemko
Reviewed by: Dean Gaudet, Ralf S. Engelschall
Revision ChangesPath
No revision
No revision
1.286.2.48 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.47
retrieving revision 1.286.2.48
diff -u -r1.286.2.47 -r1.286.2.48
--- CHANGES 1997/08/15 17:29:47 1.286.2.47
+++ CHANGES 1997/08/17 20:35:48 1.286.2.48
@@ -1,6 +1,9 @@
Changes with Apache 1.2.3
+ *) Fixed proxy-pass-through feature of mod_rewrite; Added error logging
+ information for case where proxy module is not available. [Marc Slemko]
+
*) Force proxy to always respond as HTTP/1.0, which it was failing to
do for errors and cached responses. [Roy Fielding]
1.28.2.3 +6 -3 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -r1.28.2.2 -r1.28.2.3
--- mod_rewrite.c 1997/07/31 08:43:15 1.28.2.2
+++ mod_rewrite.c 1997/08/17 20:35:49 1.28.2.3
@@ -925,8 +925,11 @@
/* check if the proxy module is enabled, so
we can actually use it! */
-if (!proxy_available)
-return FORBIDDEN;
+if (!proxy_available) {
+ log_reason(attempt to make remote request from mod_rewrite
+ without proxy enabled, r-filename, r);
+return FORBIDDEN;
+ }
/* make sure the QUERY_STRING and
PATH_INFO parts get incorporated */
@@ -3225,7 +3228,7 @@
static int is_proxy_available(server_rec *s)
{
-return (find_linked_module(mod_proxy) != NULL);
+return (find_linked_module(mod_proxy.c) != NULL);
}
cvs commit: apache/src CHANGES mod_rewrite.c mod_rewrite.h
rse 97/07/31 01:43:20 Modified:src Tag: APACHE_1_2_X CHANGES mod_rewrite.c mod_rewrite.h Log: Final sync of mod_rewrite for Apache 1.2.2: o added diff between mod_rewrite 3.0.6+ and 3.0.9 minus WIN32/NT stuff, but plus copyright removement. In detail: - workaround for detecting infinite rewriting loops - fixed setting of env vars when - is used as subst string - fixed forced response code on redirects (PR#777) - fixed cases where r-args is - kludge to disable locking on pipes under braindead SunOS - fix for rewritelog in cases where remote hostname is unknown - fixed totally damaged request_rec walk-back loop o remove static from local data and add static to global ones. o replaced ugly proxy finding stuff by simple find_linked_module(mod_proxy) call. o added missing negation char on rewritelog() o fixed a few comment typos PR: 777 Submitted by: Ralf S. Engelschall Reviewed by:Jim Jagielski, Randy Terbush, Ralf S. Engelschall Revision ChangesPath No revision No revision 1.286.2.36 +19 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.35 retrieving revision 1.286.2.36 diff -u -r1.286.2.35 -r1.286.2.36 --- CHANGES 1997/07/31 08:29:41 1.286.2.35 +++ CHANGES 1997/07/31 08:43:13 1.286.2.36 @@ -1,5 +1,24 @@ Changes with Apache 1.2.2 + *) Last official synchonisation of mod_rewrite with author version (because + mod_rewrite is now directly developed by the author at the Apache Group): + o added diff between mod_rewrite 3.0.6+ and 3.0.9 + minus WIN32/NT stuff, but plus copyright removement. + In detail: + - workaround for detecting infinite rewriting loops + - fixed setting of env vars when - is used as subst string + - fixed forced response code on redirects (PR#777) + - fixed cases where r-args is + - kludge to disable locking on pipes under braindead SunOS + - fix for rewritelog in cases where remote hostname is unknown + - fixed totally damaged request_rec walk-back loop + o remove static from local data and add static to global ones. + o replaced ugly proxy finding stuff by simple + find_linked_module(mod_proxy) call. + o added missing negation char on rewritelog() + o fixed a few comment typos + [Ralf S. Engelschall] + *) Anonymous_LogEmail was logging on each subrequest. [Dean Gaudet] PR#421, PR#868 1.28.2.2 +72 -43apache/src/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -r1.28.2.1 -r1.28.2.2 --- mod_rewrite.c 1997/06/27 02:26:30 1.28.2.1 +++ mod_rewrite.c 1997/07/31 08:43:15 1.28.2.2 @@ -52,16 +52,14 @@ */ -/* -** mod_rewrite.c -- The Main Module Code -** __ _ +/* __ _ ** _ __ ___ ___ __| |_ __ _ ___ __(_) |_ ___ ** | '_ ` _ \ / _ \ / _` | | '__/ _ \ \ /\ / / '__| | __/ _ \ ** | | | | | | (_) | (_| | | | | __/\ V V /| | | | || __/ ** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___| ** |_| ** -** URL Rewriting Module, Version 3.0.6 (15-Jun-1997) +** URL Rewriting Module ** ** This module uses a rule-based rewriting engine (based on a ** regular-expression parser) to rewrite requested URLs on the fly. @@ -78,12 +76,9 @@ ** can lead to internal subprocessing, external request redirection or even ** to internal proxy throughput. ** -** 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. +** This module was originally written in April 1996 and +** gifted exclusively to the The Apache Group in July 1997 by ** -** Written for The Apache Group by ** Ralf S. Engelschall ** [EMAIL PROTECTED] ** www.engelschall.com @@ -219,7 +214,7 @@ }; /* the cache */ -cache *cachep; +static cache *cachep; /* whether proxy module is available or not */ static int proxy_available; @@ -1114,6 +1109,7 @@ char *prefix; int l; int n; +char *ofilename; dconf = (rewrite_perdir_conf *)get_module_config(r-per_dir_config, rewrite_module); @@ -1147,6 +1143,13 @@ } /* + * remember the
cvs commit: apache/src CHANGES mod_rewrite.c mod_rewrite.h
rse 97/07/18 02:48:09 Modified:src CHANGES mod_rewrite.c mod_rewrite.h Log: mod_rewrite gifting procedure, step 2: - remove the copyright - cleanup: remove the Apache 1.2.1 related #ifdefs - updated the CHANGES file for recent updates Revision ChangesPath 1.344 +15 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.343 retrieving revision 1.344 diff -C3 -r1.343 -r1.344 *** CHANGES 1997/07/17 22:27:27 1.343 --- CHANGES 1997/07/18 09:48:05 1.344 *** *** 1,5 --- 1,20 Changes with Apache 1.3 + *) Upgraded mod_rewrite from 3.0.6+ to latest officially available version + 3.0.9. This upgrade includes: fixed deadlooping on rewriting to same + URLs, fixed rewritelog(), fixed forced response code handling on + redirects from within .htaccess files, disabled pipe locking under + braindead SunOS 4.1.x, allow env variables to be set even on rules with + no substitution, bugfixed situations where HostnameLookups is off, made + mod_rewrite more thread-safe for NT port and fixed problem when creating + an empty query string via xxx?. + This update also removes the copyright of Ralf S. Engelschall, + i.e. now mod_rewrite no longer has a shared copyright. Instead is is + exclusively copyrighted by the Apache Group now. This happended because + the author now has gifted mod_rewrite exclusively to the Apache Group and + no longer maintains an external version. + [Ralf S. Engelschall] + *) API: Added child_init function to module structure. This is called once per heavy-weight process before any requests are handled. See http_config.h for more details. [Dean Gaudet] 1.34 +5 -30 apache/src/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C3 -r1.33 -r1.34 *** mod_rewrite.c 1997/07/17 22:27:40 1.33 --- mod_rewrite.c 1997/07/18 09:48:06 1.34 *** *** 52,67 */ ! /* ! ** mod_rewrite.c -- The Main Module Code ! ** __ _ ** _ __ ___ ___ __| |_ __ _ ___ __(_) |_ ___ ** | '_ ` _ \ / _ \ / _` | | '__/ _ \ \ /\ / / '__| | __/ _ \ ** | | | | | | (_) | (_| | | | | __/\ V V /| | | | || __/ ** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___| ** |_| ** ! ** 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. --- 52,65 */ ! /* __ _ ** _ __ ___ ___ __| |_ __ _ ___ __(_) |_ ___ ** | '_ ` _ \ / _ \ / _` | | '__/ _ \ \ /\ / / '__| | __/ _ \ ** | | | | | | (_) | (_| | | | | __/\ V V /| | | | || __/ ** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___| ** |_| ** ! ** URL Rewriting Module ** ** This module uses a rule-based rewriting engine (based on a ** regular-expression parser) to rewrite requested URLs on the fly. *** *** 78,89 ** can lead to internal subprocessing, external request redirection or even ** to internal proxy throughput. ** ! ** 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 --- 76,84 ** can lead to internal subprocessing, external request redirection or even ** to internal proxy throughput. ** ! ** This module was originally written in April 1996 and ! ** gifted exclusively to the The Apache Group in July 1997 by ** ** Ralf S. Engelschall ** [EMAIL PROTECTED] ** www.engelschall.com *** *** 218,224 hook_fixup, /* [#7] pre-run fixups */ NULL,/* [#9] log a transaction */ NULL,/* [#3] header parser */ !NULL /* child_init */ }; /* the cache */ --- 213,219 hook_fixup, /* [#7] pre-run fixups */ NULL,/* [#9] log a transaction */ NULL,
cvs commit: apache/src CHANGES mod_rewrite.c mod_rewrite.h
dgaudet 97/06/26 19:26:35
Modified:src Tag: APACHE_1_2_X CHANGES mod_rewrite.c
mod_rewrite.h
Log:
Update mod_rewrite from 3.0.5 to 3.0.6.
Reviewed by: Dean, Alexei
Submitted by: Ralf
Revision ChangesPath
No revision
No revision
1.286.2.12 +7 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.11
retrieving revision 1.286.2.12
diff -C3 -r1.286.2.11 -r1.286.2.12
*** CHANGES 1997/06/27 02:20:18 1.286.2.11
--- CHANGES 1997/06/27 02:26:29 1.286.2.12
***
*** 1,5
Changes with Apache 1.2.1
!
*) If an object has multiple variants that are otherwise equal Apache
would prefer the last listed variant rather than the first.
[Paul Sutton] PR#94
--- 1,11
Changes with Apache 1.2.1
!
! *) Update mod_rewrite from 3.0.5 to 3.0.6. New ruleflag
! QSA=query_string_append. Also fixed a nasty bug in per-dir context:
! when a URL http://... was used in concunction with a special
! redirect flag, e.g. R=permanent, the permanent status was lost.
! [Ronald Tschalaer [EMAIL PROTECTED], Ralf S. Engelschall]
!
*) If an object has multiple variants that are otherwise equal Apache
would prefer the last listed variant rather than the first.
[Paul Sutton] PR#94
1.28.2.1 +12 -4 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -C3 -r1.28 -r1.28.2.1
*** mod_rewrite.c 1997/04/24 23:35:22 1.28
--- mod_rewrite.c 1997/06/27 02:26:30 1.28.2.1
***
*** 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.5 (16-Apr-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.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.
***
*** 779,784
--- 779,788
|| strcasecmp(key, G) == 0 ) {
cfg-flags |= RULEFLAG_GONE;
}
+ else if ( strcasecmp(key, qsappend) == 0
+ || strcasecmp(key, QSA) == 0 ) {
+ cfg-flags |= RULEFLAG_QSAPPEND;
+ }
else {
return pstrcat(p, RewriteRule: unknown flag ', key, '\n, NULL);
}
***
*** 1559,1564
--- 1563,1569
}
rewritelog(r, 2, [per-dir %s] redirect %s - %s, perdir,
r-filename, newuri);
r-filename = pstrdup(r-pool, newuri);
+ r-status = p-forced_responsecode;
return 1;
}
***
*** 1602,1608
reduce_uri(r);
/* split out on-the-fly generated QUERY_STRING '?x...'
*/
! splitout_queryargs(r);
/* if a MIME-type should be later forced for this URL, then
remember this */
if (p-forced_mimetype != NULL) {
--- 1607,1613
reduce_uri(r);
/* split out on-the-fly generated QUERY_STRING '?x...'
*/
! splitout_queryargs(r, p-flags RULEFLAG_QSAPPEND);
/* if a MIME-type should be later forced for this URL, then
remember this */
if (p-forced_mimetype != NULL) {
***
*** 1788,1794
**
*/
! static void splitout_queryargs(request_rec *r)
{
char *q;
char *olduri;
--- 1793,1799
**
*/
! static void splitout_queryargs(request_rec *r, int qsappend)
{
char *q;
char *olduri;
***
*** 1797,1803
if (q != NULL) {
olduri = pstrdup(r-pool, r-filename);
*q++ = '\0';
! r-args = pstrcat(r-pool, q, , r-args, NULL);
if (r-args[strlen(r-args)-1] == '')
r-args[strlen(r-args)-1] = '\0';
rewritelog(r, 3, split uri=%s - uri=%s, args=%s, olduri,
r-filename, r-args);
--- 1802,1811
if (q != NULL) {
olduri = pstrdup(r-pool, r-filename);
*q++ = '\0';
! if (qsappend)
! r-args = pstrcat(r-pool, q, , r-args, NULL);
! else
! r-args =
cvs commit: apache/src CHANGES mod_rewrite.c mod_rewrite.h
dgaudet 97/04/16 19:52:53
Modified:src CHANGES mod_rewrite.c mod_rewrite.h
Log:
Updated mod_rewrite to 3.0.5: Fixes problem with rewriting inside
Directory sections missing a trailing /.
Reviewed by: Dean, Randy
Submitted by: Ralf
Revision ChangesPath
1.236 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.235
retrieving revision 1.236
diff -C3 -r1.235 -r1.236
*** CHANGES 1997/04/17 02:50:19 1.235
--- CHANGES 1997/04/17 02:52:50 1.236
***
*** 7,12
--- 7,14
*) Updated mod_rewrite to 3.0.4: Fixes HTTP redirects from within
.htaccess files because the RewriteBase was not replaced correctly.
+ Updated mod_rewrite to 3.0.5: Fixes problem with rewriting inside
+ Directory sections missing a trailing /.
[Ralf S. Engelschall]
*) Back out the HAVE_SHMGET change for Linux because it's too late in
1.27 +11 -2 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C3 -r1.26 -r1.27
*** mod_rewrite.c 1997/04/16 06:07:44 1.26
--- mod_rewrite.c 1997/04/17 02:52:51 1.27
***
*** 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.4 (15-Apr-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.5 (16-Apr-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***
*** 309,318
a-state = ENGINE_DISABLED;
a-options = OPTION_NONE;
- a-directory = pstrdup(p, path);
a-baseurl = NULL;
a-rewriteconds= make_array(p, 2, sizeof(rewritecond_entry));
a-rewriterules= make_array(p, 2, sizeof(rewriterule_entry));
return (void *)a;
}
--- 309,327
a-state = ENGINE_DISABLED;
a-options = OPTION_NONE;
a-baseurl = NULL;
a-rewriteconds= make_array(p, 2, sizeof(rewritecond_entry));
a-rewriterules= make_array(p, 2, sizeof(rewriterule_entry));
+
+ if (path == NULL)
+ a-directory = NULL;
+ else {
+ /* make sure it has a trailing slash */
+ if (path[strlen(path)-1] == '/')
+ a-directory = pstrdup(p, path);
+ else
+ a-directory = pstrcat(p, path, /, NULL);
+ }
return (void *)a;
}
1.22 +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.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** mod_rewrite.h 1997/04/16 06:07:43 1.21
--- mod_rewrite.h 1997/04/17 02:52:51 1.22
***
*** 64,70
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.4 (17-Apr-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
--- 64,70
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** URL Rewriting Module, Version 3.0.5 (16-Apr-1997)
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
cvs commit: apache/src CHANGES mod_rewrite.c mod_rewrite.h
randy 96/12/24 11:40:20
Modified:src CHANGES mod_rewrite.c mod_rewrite.h
Log:
Sync mod_rewrite with Patchlevel 10.
Submitted by: Ralf Engelschall
Revision ChangesPath
1.98 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.97
retrieving revision 1.98
diff -C3 -r1.97 -r1.98
*** CHANGES 1996/12/24 19:17:49 1.97
--- CHANGES 1996/12/24 19:40:15 1.98
***
*** 1,5
--- 1,7
Changes with Apache 1.2b3:
+ *) Sync mod_rewrite with patch level 10. [Ralf Engelschall]
+
*) Add changes to improve the error message given for invalid
ServerName parameters. [Dirk vanGulik]
1.11 +27 -27apache/src/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** mod_rewrite.c 1996/12/12 00:36:09 1.10
--- mod_rewrite.c 1996/12/24 19:40:16 1.11
***
*** 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.
--- 61,67
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_|
**
! ** 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.
***
*** 1087,1093
rewrite_perdir_conf *dconf;
char *cp;
char *cp2;
! static char prefix[MAX_STRING_LEN];
int l;
dconf = (rewrite_perdir_conf *)get_module_config(r-per_dir_config,
rewrite_module);
--- 1087,1093
rewrite_perdir_conf *dconf;
char *cp;
char *cp2;
! char *prefix;
int l;
dconf = (rewrite_perdir_conf *)get_module_config(r-per_dir_config,
rewrite_module);
***
*** 1236,1242
document_root if it is prefix */
if ((cp = document_root(r)) != NULL) {
! strcpy(prefix, cp);
/* allways NOT have a trailing slash */
l = strlen(prefix);
if (prefix[l-1] == '/') {
--- 1236,1242
document_root if it is prefix */
if ((cp = document_root(r)) != NULL) {
! prefix = pstrdup(r-pool, cp);
/* allways NOT have a trailing slash */
l = strlen(prefix);
if (prefix[l-1] == '/') {
***
*** 1374,1381
char *uri;
char *output;
int flags;
! static char newuri[MAX_STRING_LEN];
! static char port[32];
#ifdef HAS_APACHE_REGEX_LIB
regex_t *regexp;
regmatch_t regmatch[10];
--- 1374,1381
char *uri;
char *output;
int flags;
! char newuri[MAX_STRING_LEN];
! char port[32];
#ifdef HAS_APACHE_REGEX_LIB
regex_t *regexp;
regmatch_t regmatch[10];
***
*** 1613,1619
static int apply_rewrite_cond(request_rec *r, rewritecond_entry *p, char
*perdir)
{
#ifndef HAS_APACHE_REGEX_LIB
! static char inputbuf[MAX_STRING_LEN];
int i;
#endif
char *input;
--- 1613,1619
static int apply_rewrite_cond(request_rec *r, rewritecond_entry *p, char
*perdir)
{
#ifndef HAS_APACHE_REGEX_LIB
! char inputbuf[LONG_STRING_LEN];
int i;
#endif
char *input;
***
*** 1693,1703
static void splitout_queryargs(request_rec *r)
{
char *q;
! static char olduri[MAX_STRING_LEN];
q = strchr(r-filename, '?');
if (q != NULL) {
! strcpy(olduri, r-filename);
*q++ = '\0';
r-args = pstrcat(r-pool, q, , r-args, NULL);
if (r-args[strlen(r-args)-1] == '')
--- 1693,1703
static void splitout_queryargs(request_rec *r)
{
char *q;
! char *olduri;
q = strchr(r-filename, '?');
if (q != NULL) {
! olduri = pstrdup(r-pool, r-filename);
*q++ = '\0';
r-args = pstrcat(r-pool, q, , r-args, NULL);
if (r-args[strlen(r-args)-1] == '')
***
*** 1722,1730
char *hostp;
char *url;
char c;
! static char
