cvs commit: apache-1.3/src/modules/standard mod_rewrite.c

[rse]

rse         99/10/27 01:19:01

  Modified:    src/modules/standard mod_rewrite.c
  Log:
  Indentation cleanup
  
  Revision  Changes    Path
  1.148     +10 -10    apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.147
  retrieving revision 1.148
  diff -u -r1.147 -r1.148
  --- mod_rewrite.c     1999/10/27 08:10:10     1.147
  +++ mod_rewrite.c     1999/10/27 08:18:58     1.148
  @@ -1859,7 +1859,7 @@
                   /*  One condition is false, but another can be
                    *  still true, so we have to continue...
                    */
  -             ap_table_unset(r->notes, VARY_KEY_THIS);
  +                ap_table_unset(r->notes, VARY_KEY_THIS);
                   continue;
               }
               else {
  @@ -1885,11 +1885,11 @@
                   break;
               }
           }
  -     vary = ap_table_get(r->notes, VARY_KEY_THIS);
  -     if (vary != NULL) {
  -         ap_table_merge(r->notes, VARY_KEY, vary);
  -         ap_table_unset(r->notes, VARY_KEY_THIS);
  -     }
  +        vary = ap_table_get(r->notes, VARY_KEY_THIS);
  +        if (vary != NULL) {
  +            ap_table_merge(r->notes, VARY_KEY, vary);
  +            ap_table_unset(r->notes, VARY_KEY_THIS);
  +        }
       }
       /*  if any condition fails the complete rule fails  */
       if (failed) {
  @@ -1905,7 +1905,7 @@
        */
       if ((vary = ap_table_get(r->notes, VARY_KEY)) != NULL) {
           ap_table_merge(r->headers_out, "Vary", vary);
  -     ap_table_unset(r->notes, VARY_KEY);
  +        ap_table_unset(r->notes, VARY_KEY);
       }
   
       /*
  @@ -2513,7 +2513,7 @@
   
       /* now apply the pregsub() function */
       ap_cpystrn(buf, ap_pregsub(p, buf, bri->source,
  -                         bri->nsub+1, bri->regmatch), nbuf);
  +                               bri->nsub+0, bri->regmatch), nbuf);
   
       if (c != '$') {
           /* restore the original $N backrefs */
  @@ -3640,7 +3640,7 @@
       }
       else if (strcasecmp(var, "API_VERSION") == 0) { /* non-standard */
           ap_snprintf(resultbuf, sizeof(resultbuf), "%d:%d",
  -                 MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
  +                    MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
           result = resultbuf;
       }
   
  @@ -3792,7 +3792,7 @@
               continue;
           }
           if (strcasecmp(hdrs[i].key, name) == 0) {
  -         ap_table_merge(r->notes, VARY_KEY_THIS, name);
  +            ap_table_merge(r->notes, VARY_KEY_THIS, name);
               return hdrs[i].val;
           }
       }