*** apache_base:[src.modules.proxy]proxy_cache.c;1	Mon Aug 23 11:38:21 1999

--- apache_cur:[src.modules.proxy]proxy_cache.c;3	Mon Aug 23 11:38:06 1999

***************

*** 123,129 ****

  			    const char *cachedir, const char *cachesubdir);

  static void help_proxy_garbage_coll(request_rec *r);

  static int should_proxy_garbage_coll(request_rec *r);

! #if !defined(WIN32) && !defined(MPE) && !defined(OS2)

  static void detached_proxy_garbage_coll(request_rec *r);

  #endif

  

--- 123,129 ----

  			    const char *cachedir, const char *cachesubdir);

  static void help_proxy_garbage_coll(request_rec *r);

  static int should_proxy_garbage_coll(request_rec *r);

! #if !defined(WIN32) && !defined(MPE) && !defined(OS2) && !defined(VMS)

  static void detached_proxy_garbage_coll(request_rec *r);

  #endif

  

***************

*** 143,149 ****

  

      ap_block_alarms();		/* avoid SIGALRM on big cache cleanup */

      if (should_proxy_garbage_coll(r))

! #if !defined(WIN32) && !defined(MPE) && !defined(OS2)

          detached_proxy_garbage_coll(r);

  #else

          help_proxy_garbage_coll(r);

--- 143,149 ----

  

      ap_block_alarms();		/* avoid SIGALRM on big cache cleanup */

      if (should_proxy_garbage_coll(r))

! #if !defined(WIN32) && !defined(MPE) && !defined(OS2) && !defined(VMS)

          detached_proxy_garbage_coll(r);

  #else

          help_proxy_garbage_coll(r);

***************

*** 203,209 ****

  	return 0;

  }

  

! #if !defined(WIN32) && !defined(MPE) && !defined(OS2)

  static void detached_proxy_garbage_coll(request_rec *r)

  {

      pid_t pid;

--- 203,209 ----

  	return 0;

  }

  

! #if !defined(WIN32) && !defined(MPE) && !defined(OS2) && !defined(VMS)

  static void detached_proxy_garbage_coll(request_rec *r)

  {

      pid_t pid;

***************

*** 335,343 ****

--- 335,345 ----

          if (garbage_now < lastcheck + every) {

              return 0;

          }

+ #ifndef VMS

          if (utime(filename, NULL) == -1)

              ap_log_error(APLOG_MARK, APLOG_ERR, r->server,

                           "proxy: utimes(%s)", filename);

+ #endif

      }

  

      return 1;

***************

*** 1155,1161 ****

  	    *p = '/';

  	    ++p;

  	}

! #if defined(OS2) || defined(WIN32)

  	/* Under OS/2 use rename. */

  	if (rename(c->tempfile, c->filename) == -1)

  	    ap_log_error(APLOG_MARK, APLOG_ERR, s,

--- 1157,1163 ----

  	    *p = '/';

  	    ++p;

  	}

! #if defined(OS2) || defined(WIN32) || defined(VMS)

  	/* Under OS/2 use rename. */

  	if (rename(c->tempfile, c->filename) == -1)

  	    ap_log_error(APLOG_MARK, APLOG_ERR, s,