cvs commit: apachen/src/support Makefile.tmpl httpd_monitor.c
pcs 97/08/23 05:10:44 Modified:src/support Makefile.tmpl Removed: src/support httpd_monitor.c Log: Remove httpd_monitor which now longer works with current scoreboard format, and use of a file for the scoreboard is bad anyway. Revision ChangesPath 1.5 +1 -4 apachen/src/support/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/support/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1997/07/20 23:44:49 1.4 +++ Makefile.tmpl 1997/08/23 12:10:42 1.5 @@ -11,7 +11,7 @@ .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $ -TARGETS=htpasswd htdigest httpd_monitor rotatelogs logresolve +TARGETS=htpasswd htdigest rotatelogs logresolve all: $(TARGETS) @@ -20,9 +20,6 @@ htdigest: htdigest.c $(CC) $(CFLAGS) htdigest.c -o htdigest $(LIBS) - -httpd_monitor: httpd_monitor.c - $(CC) $(INCLUDES) $(CFLAGS) httpd_monitor.c -o httpd_monitor rotatelogs: rotatelogs.c $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.c -o rotatelogs
cvs commit: apachen/src/support htdigest.c
pcs 97/08/23 05:11:25 Modified:src/support htdigest.c Log: Fix include path after core to main rename Revision ChangesPath 1.9 +1 -1 apachen/src/support/htdigest.c Index: htdigest.c === RCS file: /export/home/cvs/apachen/src/support/htdigest.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- htdigest.c1997/08/15 08:29:14 1.8 +++ htdigest.c1997/08/23 12:11:24 1.9 @@ -17,7 +17,7 @@ #include unistd.h /* This is probably the easiest way to do it */ -#include ../core/md5c.c +#include ../main/md5c.c #define LF 10 #define CR 13
cvs commit: apachen/src CHANGES
pcs 97/08/23 05:15:33 Modified:src CHANGES Log: Note removal of httpd_monitor and suggest alternative Revision ChangesPath 1.412 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.411 retrieving revision 1.412 diff -u -r1.411 -r1.412 --- CHANGES 1997/08/23 04:24:20 1.411 +++ CHANGES 1997/08/23 12:15:32 1.412 @@ -1,5 +1,9 @@ Changes with Apache 1.3a2 + *) support/httpd_monitor is no longer distributed because the + scoreboard should not be file based if at all possible. Use + mod_status to see current server snapshot. + *) (set_file_slot): New function, allowing auth directives to be independent of the server root, so the server documents can be moved to a different directory or machine more easily.
cvs commit: apachen/src/os/win32 ApacheModuleAuthAnon.dsp ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp ApacheModuleDigest.mak ApacheModuleExpires.dsp ApacheModuleExpires.mak ApacheModuleHeaders.dsp ApacheModuleHeaders.mak ApacheModuleInfo.dsp ApacheModuleInfo.mak ApacheModuleRewrite.dsp ApacheModuleRewrite.mak ApacheModuleStatus.dsp ApacheModuleStatus.mak ApacheModuleUserTrack.dsp ApacheModuleUserTrack.mak
pcs 97/08/23 07:12:55
Modified:src/modules/proxy ApacheModuleProxy.dsp
ApacheModuleProxy.mak
src/os/win32 ApacheModuleAuthAnon.dsp
ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp
ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp
ApacheModuleDigest.mak ApacheModuleExpires.dsp
ApacheModuleExpires.mak ApacheModuleHeaders.dsp
ApacheModuleHeaders.mak ApacheModuleInfo.dsp
ApacheModuleInfo.mak ApacheModuleRewrite.dsp
ApacheModuleRewrite.mak ApacheModuleStatus.dsp
ApacheModuleStatus.mak ApacheModuleUserTrack.dsp
ApacheModuleUserTrack.mak
Log:
Update module makefiles for core to main directory rename
Revision ChangesPath
1.3 +2 -2 apachen/src/modules/proxy/ApacheModuleProxy.dsp
Index: ApacheModuleProxy.dsp
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApacheModuleProxy.dsp 1997/08/13 08:37:20 1.2
+++ ApacheModuleProxy.dsp 1997/08/23 14:12:42 1.3
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\core /I ..\..\regex /D
WIN32 /D NDEBUG /D _WINDOWS /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\main /I ..\..\regex /D
WIN32 /D NDEBUG /D _WINDOWS /YX /FD /c
# ADD BASE MTL /nologo /D NDEBUG /win32
# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d NDEBUG
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D WIN32 /D _DEBUG /D
_WINDOWS /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ..\..\core /I ..\..\regex
/D WIN32 /D _DEBUG /D _WINDOWS /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ..\..\main /I ..\..\regex
/D WIN32 /D _DEBUG /D _WINDOWS /YX /FD /c
# ADD BASE MTL /nologo /D _DEBUG /win32
# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d _DEBUG
1.4 +85 -209 apachen/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleProxy.mak 1997/08/17 13:56:26 1.3
+++ ApacheModuleProxy.mak 1997/08/23 14:12:43 1.4
@@ -67,7 +67,7 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ..\..\core /I ..\..\regex /D WIN32
/D\
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ..\..\main /I ..\..\regex /D WIN32
/D\
NDEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheModuleProxy.pch /YX\
/Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\Release/
@@ -133,7 +133,7 @@
$(OUTDIR) :
if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ..\..\core /I ..\..\regex
/D\
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ..\..\main /I ..\..\regex
/D\
WIN32 /D _DEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheModuleProxy.pch /YX\
/Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c
CPP_OBJS=.\Debug/
@@ -199,278 +199,154 @@
!IF $(CFG) == ApacheModuleProxy - Win32 Release || $(CFG) ==\
ApacheModuleProxy - Win32 Debug
SOURCE=.\mod_proxy.c
-
-!IF $(CFG) == ApacheModuleProxy - Win32 Release
-
DEP_CPP_MOD_P=\
- ..\..\core\alloc.h\
- ..\..\core\buff.h\
- ..\..\core\conf.h\
- ..\..\core\explain.h\
- ..\..\core\http_config.h\
- ..\..\core\http_log.h\
- ..\..\core\http_protocol.h\
- ..\..\core\httpd.h\
+ ..\..\main\alloc.h\
+ ..\..\main\buff.h\
+ ..\..\main\conf.h\
+ ..\..\main\explain.h\
+ ..\..\main\http_config.h\
+ ..\..\main\http_log.h\
+ ..\..\main\http_protocol.h\
+ ..\..\main\httpd.h\
..\..\os\win32\readdir.h\
..\..\regex\regex.h\
.\mod_proxy.h\
+ {$(INCLUDE)}sys\stat.h\
+ {$(INCLUDE)}sys\types.h\
-
-$(INTDIR)\mod_proxy.obj : $(SOURCE) $(DEP_CPP_MOD_P) $(INTDIR)
-
-
-!ELSEIF $(CFG) == ApacheModuleProxy - Win32 Debug
-
-DEP_CPP_MOD_P=\
- ..\..\core\alloc.h\
- ..\..\core\buff.h\
- ..\..\core\conf.h\
- ..\..\core\explain.h\
- ..\..\core\http_config.h\
- ..\..\core\http_log.h\
- ..\..\core\http_protocol.h\
- ..\..\core\httpd.h\
- ..\..\os\win32\readdir.h\
- ..\..\regex\regex.h\
- .\mod_proxy.h\
+NODEP_CPP_MOD_P=\
+
cvs commit: apachen/src/modules/standard mod_negotiation.c
pcs 97/08/23 07:20:36
Modified:src/modules/standard mod_negotiation.c
Log:
mod_negotiation marks *all* responses
(HTTP/1.0) browsers and proxies caching one variant which may not be the
correct one for subsequent requests. The issue is that if you are using
mod_negotiation in a trivial way to map (say) requests for index onto
index.html *with no other variants*, Apache makes your responses
non-cacheable when they probably are safely cacheable.
This patch makes responses from mod_negotiation cacheable in the following
circumstances:
* Variants are found by multiviews (i.e. looking on the disk, rather
than reading a .var file) AND
* there was only one matching variant found on disk AND
* request version is HTTP/1.0 or earlier
Reviewed By: Roy Fielding, Dean Gaudet
Revision ChangesPath
1.55 +9 -1 apachen/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_negotiation.c 1997/08/18 13:12:16 1.54
+++ mod_negotiation.c 1997/08/23 14:20:35 1.55
@@ -227,6 +227,8 @@
array_header *accept_langs; /* accept_recs */
array_header *avail_vars; /* available variants */
+int count_multiviews_variants; /* number of variants found on disk */
+
int ua_can_negotiate; /* 1 if ua can do transparent negotiate */
int use_transparent_neg;/* 1 if we are using transparent neg */
int short_accept_headers; /* 1 if ua does trans neg sent short accpt
*/
@@ -649,6 +651,9 @@
char buffer[MAX_STRING_LEN];
enum header_state hstate;
struct var_rec mime_info;
+
+/* We are not using multiviews */
+neg-count_multiviews_variants = 0;
if (rr-status != HTTP_OK) {
return rr-status;
@@ -809,6 +814,8 @@
new_var = push_array (neg-avail_vars);
memcpy (new_var, (void *)mime_info, sizeof (var_rec));
+
+ neg-count_multiviews_variants++;
clean_var_rec(mime_info);
}
@@ -1994,7 +2001,8 @@
/* Otherwise, use it. */
-if (!do_cache_negotiated_docs(r-server) (r-proto_num 1001))
+if ((!do_cache_negotiated_docs(r-server) (r-proto_num 1001))
+ neg-count_multiviews_variants != 1)
r-no_cache = 1;
if (na_result == na_not_applied)
cvs commit: apachen/src/modules/example Makefile
pcs 97/08/23 08:24:44 Modified:src/modules/example Makefile Log: Make it work after core to main directory rename Revision ChangesPath 1.4 +1 -1 apachen/src/modules/example/Makefile Index: Makefile === RCS file: /export/home/cvs/apachen/src/modules/example/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 1997/08/10 13:32:30 1.3 +++ Makefile 1997/08/23 15:24:43 1.4 @@ -56,7 +56,7 @@ # directory. If the depth or relationship changes, the following line # may need to be changed. # -INCDIR=../../core +INCDIR=../../main # # Everything below this point should be invariant.
cvs commit: apachen/src/main conf.h httpd.h
randy 97/08/23 09:01:24 Modified:src/main conf.h httpd.h Log: Conditionalize a few more defines. Revision ChangesPath 1.127 +12 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- conf.h1997/08/18 10:59:03 1.126 +++ conf.h1997/08/23 16:01:21 1.127 @@ -162,9 +162,13 @@ #ifndef __ps2__ #define HAVE_MMAP #define USE_MMAP_FILES +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP nobody #endif +#endif +#ifndef DEFAULT_USER #define DEFAULT_USER nobody +#endif #ifdef NEED_RLIM_T typedef int rlim_t; #endif @@ -401,8 +405,12 @@ #undef NO_KILLPG #undef NO_SETSID #define JMP_BUF sigjmp_buf +#ifndef DEFAULT_USER #define DEFAULT_USER nobody +#endif +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP nogroup +#endif #elif defined(UTS21) #undef HAVE_GMTOFF @@ -431,8 +439,12 @@ #define JMP_BUF sigjmp_buf #define HAVE_MMAP #define USE_MMAP_FILES +#ifndef DEFAULT_USER #define DEFAULT_USER nobody +#endif +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP nogroup +#endif #if defined(__bsdi__) || \ (defined(__FreeBSD_version) (__FreeBSD_version 22)) typedef quad_t rlim_t; 1.142 +2 -0 apachen/src/main/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apachen/src/main/httpd.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- httpd.h 1997/08/19 07:52:42 1.141 +++ httpd.h 1997/08/23 16:01:22 1.142 @@ -366,7 +366,9 @@ #define APACHE_RELEASE 103 #define SERVER_PROTOCOL HTTP/1.1 +#ifndef SERVER_SUPPORT #define SERVER_SUPPORT http://www.apache.org/; +#endif #define DECLINED -1 /* Module declines to handle */ #define DONE -2 /* Module has served the response completely
cvs commit: apachen/src/modules/proxy Makefile
marc97/08/23 15:23:12 Modified:src/modules/proxy Makefile Log: ../../core -- ../../main cleanup. Revision ChangesPath 1.15 +1 -1 apachen/src/modules/proxy/Makefile Index: Makefile === RCS file: /export/home/cvs/apachen/src/modules/proxy/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile 1997/08/16 19:25:59 1.14 +++ Makefile 1997/08/23 22:23:11 1.15 @@ -53,7 +53,7 @@ SHELL = /bin/sh -INCDIR = ../../core +INCDIR = ../../main LIB=libproxy.a
cvs commit: /apachen/src/modules/proxy mod_proxy.h proxy_cache.c proxy_http.c proxy_util.c
marc97/08/23 15:59:13
Modified:apachen/src CHANGES
apachen/src/modules/proxy mod_proxy.h proxy_cache.c
proxy_http.c proxy_util.c
Log:
Fix the proxy to set r-headers_out when sending responses. Wherever
a header is sent, it is added to headers_out. This is necessary to
allow things like logging based on outbound headers to work properly.
PR: 569
Reviewed by: Dean Gaudet
Revision ChangesPath
1.413 +4 -0 /apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs//apachen/src/CHANGES,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- CHANGES 1997/08/23 12:15:32 1.412
+++ CHANGES 1997/08/23 22:59:08 1.413
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) Set r-headers_out when sending responses from the proxy.
+ This fixes things such as the logging of headers sent from
+ the proxy. PR#659 [Marc Slemko]
+
*) support/httpd_monitor is no longer distributed because the
scoreboard should not be file based if at all possible. Use
mod_status to see current server snapshot.
1.19 +2 -1 /apachen/src/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===
RCS file: /export/home/cvs//apachen/src/modules/proxy/mod_proxy.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_proxy.h 1997/08/17 13:56:26 1.18
+++ mod_proxy.h 1997/08/23 22:59:10 1.19
@@ -266,7 +266,8 @@
struct hdr_entry *proxy_add_header(array_header *hdrs_arr, char *field,
char *value, int rep);
void proxy_del_header(array_header *hdrs_arr, const char *field);
-void proxy_send_headers(BUFF *fp, const char *respline, array_header
*hdrs_arr);
+void proxy_send_headers(request_rec *r, const char *respline,
+array_header *hdrs_arr);
int proxy_liststr(const char *list, const char *val);
void proxy_hash(const char *it, char *val,int ndepth,int nlength);
int proxy_hex2sec(const char *x);
1.24 +2 -3 /apachen/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /export/home/cvs//apachen/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- proxy_cache.c 1997/08/17 13:56:27 1.23
+++ proxy_cache.c 1997/08/23 22:59:11 1.24
@@ -571,7 +571,7 @@
r-status = c-status;
if (!r-assbackwards) {
soft_timeout(proxy send headers, r);
- proxy_send_headers(r-connection-client, c-resp_line, c-hdrs);
+ proxy_send_headers(r, c-resp_line, c-hdrs);
kill_timeout(r);
}
bsetopt(r-connection-client, BO_BYTECT, zero);
@@ -800,8 +800,7 @@
r-status = c-status;
if (!r-assbackwards) {
soft_timeout(proxy send headers, r);
- proxy_send_headers(r-connection-client, c-resp_line,
- c-hdrs);
+ proxy_send_headers(r, c-resp_line, c-hdrs);
kill_timeout(r);
}
bsetopt(r-connection-client, BO_BYTECT, zero);
1.29 +3 -1 /apachen/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===
RCS file: /export/home/cvs//apachen/src/modules/proxy/proxy_http.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- proxy_http.c 1997/08/23 04:57:03 1.28
+++ proxy_http.c 1997/08/23 22:59:11 1.29
@@ -397,8 +397,10 @@
{
if (hdr[i].field == NULL || hdr[i].value == NULL ||
hdr[i].value[0] == '\0') continue;
- if (!r-assbackwards)
+ if (!r-assbackwards) {
rvputs(r, hdr[i].field, : , hdr[i].value, \015\012, NULL);
+ table_set(r-headers_out, hdr[i].field, hdr[i].value);
+ }
if (cache != NULL)
if (bvputs(cache, hdr[i].field, : , hdr[i].value, \015\012,
NULL) == -1)
1.24 +7 -2 /apachen/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /export/home/cvs//apachen/src/modules/proxy/proxy_util.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- proxy_util.c 1997/08/18 00:12:23 1.23
+++ proxy_util.c 1997/08/23 22:59:11 1.24
@@ -512,14 +512,18 @@
}
/*
- * Sends response line and headers
+ * Sends response line and headers. Uses the client fd and the
+ * headers_out array from the passed request_rec to talk to the client
+ * and to properly set the headers it sends for
