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

[Chuck Murcko]

chuck       96/11/24 18:49:55

  Modified:    src/modules/proxy  proxy_cache.c
  Log:
  Eliminate core dumps when CacheRoot is not defined and ProxyRequests On.
  This still allows proxy to operate. ProxyPass core dumps should be largely
  if not totally eliminated. Also. minor cleanup in this section.
  
  Revision  Changes    Path
  1.6       +3 -1      apache/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** proxy_cache.c     1996/11/04 20:43:20     1.5
  --- proxy_cache.c     1996/11/25 02:49:53     1.6
  ***************
  *** 779,785 ****
    
    /* open temporary file */
    #define TMPFILESTR  "/tmpXXXXXX"
  !     c->tempfile=palloc(r->pool,strlen(conf->cache.root)+sizeof 
TMPFILESTR-1);
        strcpy(c->tempfile,conf->cache.root);
        /*
        p = strrchr(c->tempfile, '/');
  --- 779,787 ----
    
    /* open temporary file */
    #define TMPFILESTR  "/tmpXXXXXX"
  !     if (conf->cache.root == NULL)
  !         return DECLINED;
  !     c->tempfile=palloc(r->pool,strlen(conf->cache.root)+sizeof TMPFILESTR);
        strcpy(c->tempfile,conf->cache.root);
        /*
        p = strrchr(c->tempfile, '/');