[SYNC] mod_rewrite 3.0.2

["Ralf S. Engelschall" <rs...@engelschall.com>]

Today I discovered that there is a lack of information. I always get some CVS
commit messages, but it seems not all. Because again I didn't see a commit to
mod_rewrite while there actually was one. Hmmmm.... could someone double-check
the CVS logging of the Apache repository? Seems like messages are lost or even
not send.

Fact is: I've incorporated the little perror() chances to my author version
and released it officially as 3.0.2 now. There diff below is trivial, it just
fixes the coding style (spaces instead tabs, no space between func name and
parenthesis), adds a little silly #ifdef for flock/fcntl perror() call and
increases the version number.

Commit it before 1.2b8 - no real code changes. Just style fixups...

Gruesse,
                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com

*** mod_rewrite.c.old	Sun Mar 23 03:00:15 1997
--- mod_rewrite.c	Wed Mar 26 08:55:53 1997
***************
*** 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);
      }
*** mod_rewrite.h.old	Thu Mar 20 21:00:19 1997
--- mod_rewrite.h	Wed Mar 26 08:56:01 1997
***************
*** 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.