chuck 96/12/09 14:39:22
Modified: src buff.c mod_rewrite.c mod_rewrite.h
Log:
Reviewed by: Brian Behlendorf, Chuck Murcko
Submitted by: Marc Evans <[EMAIL PROTECTED]>
patches for DEC AXP running OSF/1 v3.0.
Revision Changes Path
1.10 +1 -1 apache/src/buff.c
Index: buff.c
===================================================================
RCS file: /export/home/cvs/apache/src/buff.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** buff.c 1996/11/10 09:16:10 1.9
--- buff.c 1996/12/09 22:39:18 1.10
***************
*** 419,425 ****
for (;;)
{
! x = memchr(fb->inptr, '\012', fb->incnt);
if (x != NULL)
{
x++;
--- 419,425 ----
for (;;)
{
! x = (unsigned char *)memchr(fb->inptr, '\012', fb->incnt);
if (x != NULL)
{
x++;
1.9 +26 -26 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** mod_rewrite.c 1996/11/14 07:24:43 1.8
--- mod_rewrite.c 1996/12/09 22:39:19 1.9
***************
*** 163,194 ****
**
*/
- /* the main config structure */
- module rewrite_module = {
- STANDARD_MODULE_STUFF,
-
- init_module, /* module initializer */
-
- config_perdir_create, /* create per-dir config structures */
- config_perdir_merge, /* merge per-dir config structures */
- config_server_create, /* create per-server config structures */
- config_server_merge, /* merge per-server config structures */
- command_table, /* table of config file commands */
-
- handler_table, /* [#7] table of MIME-typed-dispatched
request action handlers */
-
- hook_uri2file, /* [#1] URI to filename translation */
-
- NULL, /* [#3] check_user_id: get and validate
user id from the HTTP request */
- NULL, /* [#4] check_auth: check if the user is
ok _here_ */
- NULL, /* [#2] check_access: check access by host
address, etc. */
-
- hook_mimetype, /* [#5] determine MIME type */
-
- hook_fixup, /* [#6] pre-run fixups */
- NULL /* [#8] log a transaction */
- };
-
/* the table of commands we provide */
static command_rec command_table[] = {
{ "RewriteEngine", cmd_rewriteengine, NULL, OR_FILEINFO, FLAG,
--- 163,168 ----
***************
*** 214,219 ****
--- 188,219 ----
static handler_rec handler_table[] = {
{ "redirect-handler", handler_redirect },
{ NULL }
+ };
+
+ /* the main config structure */
+ module rewrite_module = {
+ STANDARD_MODULE_STUFF,
+
+ init_module, /* module initializer */
+
+ config_perdir_create, /* create per-dir config structures */
+ config_perdir_merge, /* merge per-dir config structures */
+ config_server_create, /* create per-server config structures */
+ config_server_merge, /* merge per-server config structures */
+ command_table, /* table of config file commands */
+
+ handler_table, /* [#7] table of MIME-typed-dispatched
request action handlers */
+
+ hook_uri2file, /* [#1] URI to filename translation */
+
+ NULL, /* [#3] check_user_id: get and validate
user id from the HTTP request */
+ NULL, /* [#4] check_auth: check if the user is
ok _here_ */
+ NULL, /* [#2] check_access: check access by host
address, etc. */
+
+ hook_mimetype, /* [#5] determine MIME type */
+
+ hook_fixup, /* [#6] pre-run fixups */
+ NULL /* [#8] log a transaction */
};
/* the common cache */
1.11 +0 -2 apache/src/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** mod_rewrite.h 1996/11/20 19:55:06 1.10
--- mod_rewrite.h 1996/12/09 22:39:20 1.11
***************
*** 280,287 ****
/* static config */
extern module rewrite_module;
- static command_rec command_table[];
- static handler_rec handler_table[];
extern cache *cachep;
/* config structure handling */
--- 280,285 ----
