fielding 97/03/28 17:56:00
Modified: src CHANGES mod_rewrite.h mod_rewrite.c
Log:
Updated to 3.0.2 -- minor style changes.
Submitted by: Ralf S. Engelschall
Reviewed by: Roy Fielding
Revision Changes Path
1.214 +1 -1 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.213
retrieving revision 1.214
diff -C3 -r1.213 -r1.214
*** CHANGES 1997/03/29 01:48:19 1.213
--- CHANGES 1997/03/29 01:55:56 1.214
***************
*** 107,113 ****
other than the name defined in the virtualhost directive (but
with the same IP address) failing. [Dean Gaudet]
! *) Updated mod_rewrite to version 3.0.1, which: fixes compile error on
AIX; improves the redirection stuff to enable the users to generally
redirect to http, https, gopher and ftp; added TIME variable for
RewriteCond which expands to YYYYMMDDHHMMSS strings and added the
--- 107,113 ----
other than the name defined in the virtualhost directive (but
with the same IP address) failing. [Dean Gaudet]
! *) Updated mod_rewrite to version 3.0.2, which: fixes compile error on
AIX; improves the redirection stuff to enable the users to generally
redirect to http, https, gopher and ftp; added TIME variable for
RewriteCond which expands to YYYYMMDDHHMMSS strings and added the
1.19 +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.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** mod_rewrite.h 1997/03/20 18:03:34 1.18
--- mod_rewrite.h 1997/03/29 01:55:57 1.19
***************
*** 64,70 ****
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_____|
**
! ** URL Rewriting Module, Version 3.0.1 (17-Mar-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.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.
1.24 +16 -8 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** mod_rewrite.c 1997/03/22 23:51:03 1.23
--- mod_rewrite.c 1997/03/29 01:55:57 1.24
***************
*** 61,67 ****
** |_| |_| |_|\___/ \__,_|___|_| \___| \_/\_/ |_| |_|\__\___|
** |_____|
**
! ** URL Rewriting Module, Version 3.0.1 (17-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.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.
***************
*** 2250,2258 ****
fname = server_root_relative(p, conf->rewritelogfile);
if (*conf->rewritelogfile == '|') {
! if (!spawn_child (p, rewritelog_child, (void
*)(conf->rewritelogfile+1),
kill_after_timeout, &fp, NULL)) {
! perror ("spawn_child");
fprintf (stderr, "mod_rewrite: could not fork child for
RewriteLog process\n");
exit (1);
}
--- 2250,2258 ----
fname = server_root_relative(p, conf->rewritelogfile);
if (*conf->rewritelogfile == '|') {
! if (!spawn_child(p, rewritelog_child, (void
*)(conf->rewritelogfile+1),
kill_after_timeout, &fp, NULL)) {
! perror("spawn_child");
fprintf (stderr, "mod_rewrite: could not fork child for
RewriteLog process\n");
exit (1);
}
***************
*** 2405,2413 ****
fpout = NULL;
rc = spawn_child(p, rewritemap_program_child, (void
*)map->datafile, kill_after_timeout, &fpin, &fpout);
if (rc == 0 || fpin == NULL || fpout == NULL) {
! perror ("spawn_child");
! fprintf (stderr, "mod_rewrite: could not fork child for
RewriteMap process\n");
! exit (1);
}
map->fpin = fileno(fpin);
map->fpout = fileno(fpout);
--- 2405,2413 ----
fpout = NULL;
rc = spawn_child(p, rewritemap_program_child, (void
*)map->datafile, kill_after_timeout, &fpin, &fpout);
if (rc == 0 || fpin == NULL || fpout == NULL) {
! perror("spawn_child");
! fprintf(stderr, "mod_rewrite: could not fork child for
RewriteMap process\n");
! exit(1);
}
map->fpin = fileno(fpin);
map->fpout = fileno(fpout);
***************
*** 3217,3223 ****
#endif
if (rc < 0) {
! perror ("flock");
fprintf(stderr, "Error getting lock. Exiting!");
exit(1);
}
--- 3217,3227 ----
#endif
if (rc < 0) {
! #ifdef USE_FLOCK
! perror("flock");
! #else
! perror("fcntl");
! #endif
fprintf(stderr, "Error getting lock. Exiting!");
exit(1);
}
***************
*** 3242,3248 ****
#endif
if (rc < 0) {
! perror ("flock");
fprintf(stderr, "Error freeing lock. Exiting!");
exit(1);
}
--- 3246,3256 ----
#endif
if (rc < 0) {
! #ifdef USE_FLOCK
! perror("flock");
! #else
! perror("fcntl");
! #endif
fprintf(stderr, "Error freeing lock. Exiting!");
exit(1);
}
