chuck 96/07/28 15:17:55
Modified: src CHANGES mod_proxy.c
Log:
Submitted by: Chuck Murcko
added NoCache * directive to enable proper operation w/o caching
changed #tmpXXXX to tmpXXXX in temp file template, for broken link/unlink
changed Expire to Expires in cache_update()
added $Id$
Revision Changes Path
1.45 +14 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.44
retrieving revision 1.45
diff -C3 -r1.44 -r1.45
*** CHANGES 1996/07/17 23:20:47 1.44
--- CHANGES 1996/07/28 22:17:49 1.45
***************
*** 1,5 ****
--- 1,19 ----
Changes with Apache 1.2b1:
+ *) Changes to mod_proxy since 1.1beta:
+ tested w/SOCKS proxy for http
+ fixed IP address formation in host2addr()
+ fixed SIGALRM on big cache cleanup
+ fixed temp files #tmp not removed
+ changed PF_INET to AF_INET in socket() calls
+ installed CONNECT code from Troy Morrison <[EMAIL PROTECTED]> for
testing
+ added NoCache config directive to disallow caching for selected hosts
+ added NoCache * directive to enable proper operation w/o caching
+ changed #tmpXXXX to tmpXXXX in temp file template, for broken
link/unlink
+ changed Expire to Expires in cache_update()
+ added appropriate #defines for Next compile
+ added $Id: CHANGES,v 1.45 1996/07/28 22:17:49 chuck Exp $ for RCS/CVS
[Chuck Murcko]
+
*) Fix ErrorDocument handling. When ErrorDocument failed it used to
display filename instead of error message. [Paul Sutton]
1.35 +20 -13 apache/src/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_proxy.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C3 -r1.34 -r1.35
*** mod_proxy.c 1996/07/28 19:27:49 1.34
--- mod_proxy.c 1996/07/28 22:17:51 1.35
***************
*** 51,56 ****
--- 51,60 ----
*/
/*
+ * $Id: mod_proxy.c,v 1.35 1996/07/28 22:17:51 chuck Exp $
+ */
+
+ /*
Note that the Explain() stuff is not yet complete.
Also note numerous FIXMEs and CHECKMEs which should be eliminated.
***************
*** 71,87 ****
Ben Laurie <[EMAIL PROTECTED]> 30 Mar 96
! More changes:
! 0) tested w/SOCKS proxy for http
! 1) fixed IP address formation in host2addr()
! 2) fixed SIGALRM on big cache cleanup
! 3) fixed temp files #tmp not removed
! 4) changed PF_INET to AF_INET in socket() calls
! 5) installed CONNECT code from Troy Morrison <[EMAIL PROTECTED]> for testing
! 6) added NoCache config directive to disallow caching for selected hosts
! Chuck Murcko <[EMAIL PROTECTED]> 2 Jun 96
*/
--- 75,93 ----
Ben Laurie <[EMAIL PROTECTED]> 30 Mar 96
! More things to do:
!
! 0. Massive code cleanup & break into multiple files; link as a lib
!
! 1. Check date routines
!
! 2. Get ftp working, add PASV mode
!
! 3. Add gopher & WAIS
! 4. Various other fixups to insure no NULL strings parsed, etc.
! Chuck Murcko <[EMAIL PROTECTED]> 28 Jul 96
*/
***************
*** 1413,1419 ****
sprintf(filename, "%s%s", cachedir, ent->d_name);
Explain1("GC Examining file %s",filename);
/* is it a temporary file? */
! if (strncmp(ent->d_name, "#tmp", 4) == 0)
{
/* then stat it to see how old it is; delete temporary files > 1 day old */
if (stat(filename, &buf) == -1)
--- 1419,1425 ----
sprintf(filename, "%s%s", cachedir, ent->d_name);
Explain1("GC Examining file %s",filename);
/* is it a temporary file? */
! if (strncmp(ent->d_name, "tmp", 3) == 0)
{
/* then stat it to see how old it is; delete temporary files > 1 day old */
if (stat(filename, &buf) == -1)
***************
*** 1783,1789 ****
/* read expiry date; if a bad date, then leave it so the client can
* read it
*/
! expire = get_header(resp_hdrs, "Expire");
if (expire != NULL) expc = parsedate(expire->value, NULL);
else expc = -1;
--- 1789,1795 ----
/* read expiry date; if a bad date, then leave it so the client can
* read it
*/
! expire = get_header(resp_hdrs, "Expires");
if (expire != NULL) expc = parsedate(expire->value, NULL);
else expc = -1;
***************
*** 1974,1980 ****
buff[35] = ' ';
/* open temporary file */
! #define TMPFILESTR "/#tmpXXXXXX"
c->tempfile=palloc(r->pool,strlen(conf->cache.root)+sizeof
TMPFILESTR-1);
strcpy(c->tempfile,conf->cache.root);
/*
--- 1980,1986 ----
buff[35] = ' ';
/* open temporary file */
! #define TMPFILESTR "/tmpXXXXXX"
c->tempfile=palloc(r->pool,strlen(conf->cache.root)+sizeof
TMPFILESTR-1);
strcpy(c->tempfile,conf->cache.root);
/*
***************
*** 2923,2929 ****
/* check if NoCache directive on this host */
for (i=0; i < conf->nocaches->nelts; i++)
{
! if (ent[i].name != NULL && strstr(host, ent[i].name) != NULL)
nocache = 1;
}
--- 2929,2936 ----
/* check if NoCache directive on this host */
for (i=0; i < conf->nocaches->nelts; i++)
{
! if (ent[i].name[0] == '*' || (ent[i].name != NULL &&
! strstr(host, ent[i].name) != NULL))
nocache = 1;
}
