cvs commit: apache/src CHANGES http_core.c

[Dean Gaudet]

dgaudet     97/04/24 03:19:11

  Modified:    src       CHANGES http_core.c
  Log:
  Fixes problem with <Directory proxy:...>
  
  Submitted by: Martin Kraemer
  Reviewed by:  Chuck, Dean
  
  Revision  Changes    Path
  1.244     +2 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.243
  retrieving revision 1.244
  diff -C3 -r1.243 -r1.244
  *** CHANGES   1997/04/24 10:16:54     1.243
  --- CHANGES   1997/04/24 10:19:09     1.244
  ***************
  *** 1,4 ****
  --- 1,6 ----
    Changes with Apache 1.2
  +   
  +   *) Fix problem with <Directory proxy:...>. [Martin Kraemer] PR#271
    
      *) Corrected spelling of "authoritative".  AuthDBAuthoratative became
         AuthDBAuthoritative. [Marc Slemko] PR#420
  
  
  
  1.80      +1 -0      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -C3 -r1.79 -r1.80
  *** http_core.c       1997/04/22 02:42:07     1.79
  --- http_core.c       1997/04/24 10:19:09     1.80
  ***************
  *** 82,87 ****
  --- 82,88 ----
          (core_dir_config *)pcalloc(a, sizeof(core_dir_config));
      
        if (!dir || dir[strlen(dir) - 1] == '/') conf->d = dir;
  +     else if (strncmp(dir,"proxy:",6)==0) conf->d = pstrdup (a, dir);
        else conf->d = pstrcat (a, dir, "/", NULL);
        conf->d_is_matchexp = conf->d ? is_matchexp( conf->d ) : 0;