cvs commit: apachen/src/main http_core.c

[martin]

martin      97/10/21 14:33:10

  Modified:    src/main http_core.c
  Log:
  Some of the <...> directives allow multiple arguments, some don't.
  Those who don't accept multiple arguments to <...> block directives
  return an error message now.
  Reviewed by:  Martin +1, Brian +1, Dean +1
  
  Revision  Changes    Path
  1.126     +13 -1     apachen/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apachen/src/main/http_core.c,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- http_core.c       1997/10/07 19:34:00     1.125
  +++ http_core.c       1997/10/21 21:33:08     1.126
  @@ -817,7 +817,11 @@
       conf->r = r;
   
       add_per_dir_conf (cmd->server, new_dir_conf);
  - 
  +
  +    if (*arg != '\0')
  +     return pstrcat (cmd->pool, "Multiple <", (cmd->info) ? "DirectoryMatch" 
: "Directory",
  +                     "> arguments not (yet) supported.", NULL);
  +
       cmd->path = old_path;
       cmd->override = old_overrides;
   
  @@ -867,6 +871,10 @@
   
       add_per_url_conf (cmd->server, new_url_conf);
       
  +    if (*arg != '\0')
  +     return pstrcat (cmd->pool, "Multiple <", (cmd->info) ? "LocationMatch" 
: "Location",
  +                     "> arguments not (yet) supported.", NULL);
  +
       cmd->path = old_path;
       cmd->override = old_overrides;
   
  @@ -928,6 +936,10 @@
   
       add_file_conf (c, new_file_conf);
       
  +    if (*arg != '\0')
  +     return pstrcat (cmd->pool, "Multiple <", (cmd->info) ? "FilesMatch" : 
"Files",
  +                     "> arguments not (yet) supported.", NULL);
  +
       cmd->path = old_path;
       cmd->override = old_overrides;