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 Changes Path
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, /* [#3] header parser */
! NULL /* child_init */
};
/* the cache */
***************
*** 2328,2342 ****
}
/* Child process code for 'RewriteLog "|..."' */
- #if MODULE_MAGIC_NUMBER > 19970622
static int rewritelog_child(void *cmd)
- #else
- static void rewritelog_child(void *cmd)
- #endif
{
- #if MODULE_MAGIC_NUMBER > 19970622
int child_pid = 1;
- #endif
cleanup_for_exec();
signal(SIGHUP, SIG_IGN);
--- 2323,2331 ----
***************
*** 2348,2358 ****
#else
execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
#endif
- #if MODULE_MAGIC_NUMBER > 19970622
return(child_pid);
- #else
- return;
- #endif
}
static void rewritelog(request_rec *r, int level, const char *text, ...)
--- 2337,2343 ----
***************
*** 2494,2508 ****
}
/* child process code */
- #if MODULE_MAGIC_NUMBER > 19970622
static int rewritemap_program_child(void *cmd)
- #else
- static void rewritemap_program_child(void *cmd)
- #endif
{
- #if MODULE_MAGIC_NUMBER > 19970622
int child_pid = 1;
- #endif
cleanup_for_exec();
signal(SIGHUP, SIG_IGN);
--- 2479,2487 ----
***************
*** 2514,2524 ****
#else
execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
#endif
- #if MODULE_MAGIC_NUMBER > 19970622
return(child_pid);
- #else
- return;
- #endif
}
--- 2493,2499 ----
1.27 +3 -14 apache/src/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C3 -r1.26 -r1.27
*** mod_rewrite.h 1997/07/13 09:04:51 1.26
--- mod_rewrite.h 1997/07/18 09:48:06 1.27
***************
*** 64,70 ****
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_____|
**
! ** 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.
--- 64,70 ----
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_____|
**
! ** URL Rewriting Module
**
** This module uses a rule-based rewriting engine (based on a
** regular-expression parser) to rewrite requested URLs on the fly.
***************
*** 81,92 ****
** 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
--- 81,89 ----
** 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
***************
*** 357,377 ****
/* rewriting logfile support */
static void open_rewritelog(server_rec *s, pool *p);
- #if MODULE_MAGIC_NUMBER > 19970622
static int rewritelog_child(void *cmd);
- #else
- static void rewritelog_child(void *cmd);
- #endif
static void rewritelog(request_rec *r, int level, const char *text, ...);
static char *current_logtime(request_rec *r);
/* program map support */
static void run_rewritemap_programs(server_rec *s, pool *p);
- #if MODULE_MAGIC_NUMBER > 19970622
static int rewritemap_program_child(void *cmd);
- #else
- static void rewritemap_program_child(void *cmd);
- #endif
/* env variable support */
static void expand_variables_inbuffer(request_rec *r, char *buf, int
buf_len);
--- 354,366 ----
