cvs commit: apache-1.3/src/modules/proxy proxy_cache.c

[dgaudet]

dgaudet     98/07/28 09:59:11

  Modified:    src      CHANGES
               src/modules/proxy proxy_cache.c
  Log:
  fix a segfault in the proxy on OS/2
  
  Submitted by: Brian Havard
  
  Revision  Changes    Path
  1.990     +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.989
  retrieving revision 1.990
  diff -u -r1.989 -r1.990
  --- CHANGES   1998/07/27 14:58:17     1.989
  +++ CHANGES   1998/07/28 16:59:09     1.990
  @@ -1,5 +1,7 @@
   Changes with Apache 1.3.2
   
  +  *) Fix a segfault in the proxy on OS/2.  [Brian Havard]
  +
     *) Fix Win32 part of ap_spawn_child() by providing a reasonable child_info
        structure instead of just NULL. This fixes at least the RewriteMap
        programs under Win32. [Marco De Michele <[EMAIL PROTECTED]>] PR#2483
  
  
  
  1.47      +2 -1      apache-1.3/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- proxy_cache.c     1998/07/09 19:45:56     1.46
  +++ proxy_cache.c     1998/07/28 16:59:11     1.47
  @@ -846,7 +846,8 @@
            c->fp = NULL;
        }
   /* delete the previously cached file */
  -     unlink(c->filename);
  +        if (c->filename)
  +            unlink(c->filename);
        return DECLINED;        /* send data to client but not cache */
       }