cvs commit: apache/src http_core.c

[Alexei Kosut <ak...@hyperreal.com>]

akosut      96/04/10 19:56:20

  Modified:    src       http_core.c
  Log:
  Fix bus error in <Location> handling when an error was returned from
  within the section.
  
  Revision  Changes    Path
  1.11      +2 -2      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** http_core.c	1996/04/06 23:38:25	1.10
  --- http_core.c	1996/04/11 02:56:17	1.11
  ***************
  *** 548,553 ****
  --- 548,554 ----
        cmd->override = OR_ALL|ACCESS_CONF;
    
        errmsg = srm_command_loop (cmd, new_url_conf);
  +     if (errmsg != end_url_magic) return errmsg;
    
        conf = (core_dir_config *)get_module_config(new_url_conf, &core_module);
        conf->d = pstrdup(cmd->pool, cmd->path);	/* No mangling, please */
  ***************
  *** 557,564 ****
        cmd->path = old_path;
        cmd->override = old_overrides;
    
  !     if (errmsg == end_url_magic) return NULL;
  !     return errmsg;
    }
    
    /* httpd.conf commands... beginning with the <VirtualHost> business */
  --- 558,564 ----
        cmd->path = old_path;
        cmd->override = old_overrides;
    
  !     return NULL;
    }
    
    /* httpd.conf commands... beginning with the <VirtualHost> business */