cvs commit: apache-1.3 KEYS
randy 99/08/20 09:57:28 Modified:.KEYS Log: Update key. Revision ChangesPath 1.25 +8 -3 apache-1.3/KEYS Index: KEYS === RCS file: /home/cvs/apache-1.3/KEYS,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- KEYS 1999/08/16 22:46:42 1.24 +++ KEYS 1999/08/20 16:57:18 1.25 @@ -190,9 +190,10 @@ Type Bits/KeyIDDate User ID pub 1024/631B5749 1996/06/21 Randy Terbush [EMAIL PROTECTED] + Randy Terbush [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- -Version: 2.6.3 +Version: 2.6.3ia mQCNAzHLBS8AAAEEANGFXb9o0NPVfVjSLvQh1j3fN6cMeVNA5BGUJ6HZGP/NDxTE i8hwejJqakkU4ux/g6Kqckrx3h8WR7OXZZ+R8CsA0bg9Sr42ndEQCUISgArg+lXZ @@ -200,8 +201,12 @@ tCFSYW5keSBUZXJidXNoIDxyYW5keUB6eXp6eXZhLmNvbT6JAJUDBRAxywUwqKsN 4GMbV0kBAegnA/sH63WyfwMFmn3nWe8T/5IXO/QkMYoMGLS1i7IxMY9O8BVvKQM+ oxEcJdFAG7zPZkpgKzTBxmExz5hMZ9hwJ42XhrslWoP7JVvADJcdthrUAYW9W+jx -GcDYAW3qW5DpKsQchfvXq9QOBDxP+Kbbe2B8xGEyGUhLkacISFTrIhhQSg== -=8P8s +GcDYAW3qW5DpKsQchfvXq9QOBDxP+Kbbe2B8xGEyGUhLkacISFTrIhhQSrQiUmFu +ZHkgVGVyYnVzaCA8cmFuZHlAY292YWxlbnQubmV0PokAlQMFEDXwEhioqw3gYxtX +SQEBnaED/1AJCYW7jKCtBaZZLhp5TRtYSQxBMTmT2b4bDE4mbTb0VtDgpfrp5yOu +xTtJxiQ53jIenv58qYLMhVBUsuMjWjnTVtNF6531n0T6v/K0ByNmUqKwStH/8qLX +i+I4VWinALYcSOZDxranDey+1oVyw0NpvJMFFEhF0fmPRlSpaq5c +=x5FB -END PGP PUBLIC KEY BLOCK- Type Bits/KeyIDDate User ID
cvs commit: apache-1.3 STATUS
randy 99/08/20 15:54:03 Modified:.STATUS Log: New binary distributions available. These names don't match the names generated by GuessOS. May I please fix this? Revision ChangesPath 1.753 +20 -13apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- STATUS1999/08/20 21:28:13 1.752 +++ STATUS1999/08/20 22:54:01 1.753 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/20 21:28:13 $] + Last modified at [$Date: 1999/08/20 22:54:01 $] Release: @@ -457,43 +457,50 @@ Platform Avail. Volunteer -- alpha-dec-osf3.0 no Sameer Parekh - alpha-dec-osf4.0 no Lars Eilebrecht, Ken Coar + alpha-dec-osf4.0 yes Lars Eilebrecht, Ken Coar, Randy Terbush + alpha-whatever-linux2 yes Randy Terbush armv4l-whatever-linux2no Rasmus Lerdorf - hppa1.1-hp-hpux no Rob Hartill + hppa1.1-hp-hpux-10.x yes Rob Hartill, Randy Terbush i386-slackware-linux(a.out) no Sameer Parekh i386-sun-solaris2.5 no Sameer Parekh + i386-sun-solaris2.6 yes Randy Terbush i386-sun-solaris2.7 no Cliff Skolnick - i386-unixware-svr4no Sameer Parekh + i386-unixware-svr4yes Sameer Parekh, Randy Terbush i386-unknown-freebsd2.1 no Andrew Wilson, Brian Tao i386-unknown-freebsd2.2.8 no Jim Jagielski i386-whatever-freebsd3.0 no Ken Coar i386-whatever-freebsd3.0 no Dirk-Willem van Gulik i686-pc-freebsd3.1no Ralf S. Engelschall - i586-unknown-linux2 no Ralf S. Engelschall, Lars Eilebrecht + i586-unknown-linux2 yes Ralf S. Engelschall, Lars Eilebrecht, Randy Terbush i686-unknown-linux2 no Lars Eilebrecht - i686-whatever-linux2 no Ken Coar + i686-whatever-linux2 yes Ken Coar, Randy Terbush i386-unknown-linux(ELF) no Aram Mirzadeh, Michael Douglass - i386-unknown-netBSD-1.3.2 no Lars Eilebrecht + i386-unknown-netBSD-1.3.2 yes Lars Eilebrecht, Randy Terbush i386-unknown-sco3 no Ben Laurie i386-unknown-sco5 no Ben Laurie i386-sni-svr4 no Martin Kraemer + i386-dg-dgux5.4R2.01 yes Randy Terbush + x86-qnx-4.x yes Randy Terbush + x86-bsdos-3.x yes Randy Terbush + x86-bsdos-4.x yes Randy Terbush + x86-openbsd-2.x yes Randy Terbush m68k-apple-aux3.1.1 no Jim Jagielski m88k-dg-dgux5.4R2.01 no Sameer parekh m88k-next-nextno Rob Hartill mips-dec-ultrix4.4no Sameer Parekh mips-unknown-linuxyes Lars Eilebrecht - mips-sgi-irix5.3 no Mark Imbrianco - mips-sgi-irix6.2 no Lars Eilebrecht + mips-sgi-irix5.3 yes Mark Imbrianco, Randy Terbush + mips-sgi-irix6.2 yes Lars Eilebrecht, Randy Terbush mips-sgi-irix6.4 no Lars Eilebrecht mips-sni-svr4 no Martin Kraemer OS/2 yes Brian Havard powerpc-apple-rhapsody5.3 no Wilfredo Sanchez rs6000-ibm-aix3.2.5 no Sameer Parekh rs6000-ibm-aix4.1 no Lars Eilebrecht - rs6000-ibm-aix4.2 no Bill Stoddard - rs6000-ibm-aix4.3.2 no Bill Stoddard - sparc-sun-solaris2.5 no Lars Eilebrecht + rs6000-ibm-aix4.2 yes Bill Stoddard + rs6000-ibm-aix4.3.x yes Bill Stoddard, Randy Terbush + sparc-sun-solaris2.5 yes Lars Eilebrecht, Randy Terbush sparc-sun-solaris2.6 yes Lars Eilebrecht sparc-sun-solaris2.7 no Cliff Skolnick sparc-sun-sunos4.1.3_U1 no Sameer Parekh - sparc-unknown-linux no Lars Eilebrecht + sparc-unknown-linux yes Lars Eilebrecht, Randy Terbush
cvs commit: apache-1.3/src Configure
randy 99/08/15 17:49:09 Modified:src Configure Log: Make HPUX use the default .so extension for DSO modules. The right way to do this is probably to propagate the use of SHLIB_EXT_NAME throughout the configuration process, but we have used .so forever for HPUX without any problem and a change of the code to do this The Right Way would be too risky at this late stage. Problem solved. Lets roll. Revision ChangesPath 1.369 +0 -2 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- Configure 1999/08/09 17:46:25 1.368 +++ Configure 1999/08/16 00:49:08 1.369 @@ -1217,7 +1217,6 @@ LDFLAGS_SHLIB=-b LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred - SHLIB_SUFFIX_NAME=sl ;; *-hp-hpux10.*|*-hp-hpux11.*) case $CC in @@ -1227,7 +1226,6 @@ LDFLAGS_SHLIB=-b LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred -Wl,+s - SHLIB_SUFFIX_NAME=sl ;; *-ibm-aix*) case $CC in
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/08/12 20:26:30 Modified:src CHANGES src/helpers binbuild.sh Log: Add -R flag to apachectl for binary builds to work around lack of absolute path to ./libexec directory for SHARED_CORE architectures that need to load libhttp.ep. Revision ChangesPath 1.1417+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1416 retrieving revision 1.1417 diff -u -r1.1416 -r1.1417 --- CHANGES 1999/08/12 18:09:58 1.1416 +++ CHANGES 1999/08/13 03:26:21 1.1417 @@ -1,5 +1,10 @@ Changes with Apache 1.3.9 + *) For binary builds, add -R flag to apachectl to work around the +lack of an absolute path to the ./libexec directory where +libhttp.ep file is needed for SHARED_CORE architectures. +[Randy Terbush [EMAIL PROTECTED] + *) Roll back (re)naming in the uuencode/decode section. The ap/ap_ routines are now called ap_base64* and are 'plain'. I.e. no pool access or anything clever. Inside apache the routines 1.13 +1 -1 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- binbuild.sh 1999/08/10 16:06:52 1.12 +++ binbuild.sh 1999/08/13 03:26:29 1.13 @@ -223,7 +223,7 @@ echo -e \s;[EMAIL PROTECTED]@;\$SR/conf;\ bindist/bin/apxs \$SR/bin/apxs \ echo sed -e \s;^#!/.*;#!\$PERL;\ bindist/bin/dbmmanage \$SR/bin/dbmmanage \ echo sed -e \s%/usr/local/apache%\$SR%\ \$SR/conf/httpd.conf.default \$SR/conf/httpd.conf \ - echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e \s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR\\\%\ bindist/bin/apachectl \$SR/bin/apachectl \ + echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e \s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR -R \$SR/libexec\\\%\ bindist/bin/apachectl \$SR/bin/apachectl \ echo\ echo echo \Ready.\ \ echo echo \ ++\ \
cvs commit: apache-1.3/src/os/win32/installer/installdll install.c
randy 99/08/12 09:22:35
Modified:src/os/win32/installer/installdll install.c
Log:
Changes to migrate to InstallShield 5.5 and provide a bit more error
checking.
Changes to allow compiling on VS 6.0.
Revision ChangesPath
1.5 +28 -29apache-1.3/src/os/win32/installer/installdll/install.c
Index: install.c
===
RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/install.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- install.c 1999/02/16 12:28:10 1.4
+++ install.c 1999/08/12 16:22:34 1.5
@@ -9,8 +9,7 @@
#define VERSION ( 1.003 __DATE__ __TIME__ )
-#include windows.h
-#include winsock.h
+#include winsock2.h
#include string.h
#include stdio.h
#include direct.h
@@ -23,20 +22,14 @@
#undef strftime
#endif
+#define AP_WIN32ERROR 1
+
/* Global to store the instance handle */
HINSTANCE hInstance = NULL;
static char *szLogFilename = NULL;
static FILE *fpLog = NULL;
-void OpenLog(char *dir, char *fn)
-{
-szLogFilename = malloc(strlen(dir) + 1 + strlen(fn) + 1);
-sprintf(szLogFilename, %s/%s, dir, fn);
-
-fpLog = fopen(szLogFilename, a+);
-}
-
void LogMessage(char *fmt, ...)
{
char buf[4000];
@@ -70,13 +63,6 @@
fprintf(fpLog, %s\n, buf);
}
-void CloseLog(void)
-{
-if (fpLog) {
- fclose(fpLog);
-}
-}
-
/*
* MessageBox_error() is a helper function to display an error in a
* message box, optionally including a Win32 error message. If
@@ -87,8 +73,6 @@
* passed on to the Win32 MessageBox() call.
*/
-#define AP_WIN32ERROR 1
-
int MessageBox_error(HWND hWnd, int opt, char *title,
int mb_opt, char *fmt, ...)
{
@@ -162,6 +146,29 @@
return MessageBox(hWnd, buf, title, mb_opt);
}
+int OpenLog(HWND hwnd, char *dir, char *fn)
+{
+szLogFilename = malloc(strlen(dir) + 1 + strlen(fn) + 1);
+sprintf(szLogFilename, %s\\%s, dir, fn);
+
+if ((fpLog = fopen(szLogFilename, a+)) == NULL) {
+ MessageBox_error(hwnd,
+ AP_WIN32ERROR,
+ Installation Problem,
+ MB_OK | MB_ICONSTOP,
+ Cannot open log file %s, szLogFilename);
+ return -1;
+}
+return 0;
+}
+
+void CloseLog(void)
+{
+if (fpLog) {
+ fclose(fpLog);
+}
+}
+
/*
* The next few functions handle expanding the @@ServerRoot@@ type
* sequences found in the distribution files. The main entry point
@@ -558,14 +565,6 @@
{ CMD_COPY, .tmp\\highperformance.conf-dist,
conf\\highperformance.conf-dist,
OPT_EXPAND|OPT_OVERWRITE|OPT_DELETESOURCE },
-/* Move the default htdocs files into place, provided they don't already
- * exist.
- */
-{ CMD_COPY, .tmp\\index.html, htdocs\\index.html,
OPT_DELETESOURCE|OPT_SILENT },
-{ CMD_RM, .tmp\\index.html, NULL, OPT_SILENT },
-{ CMD_COPY, .tmp\\apache_pb.gif, htdocs\\apache_pb.gif,
OPT_DELETESOURCE|OPT_SILENT },
-{ CMD_RM, .tmp\\apache_pb.gif, NULL, OPT_SILENT },
-
{ CMD_RMDIR, .tmp, NULL },
{ CMD_END, NULL, NULL, OPT_NONE }
@@ -583,7 +582,7 @@
ACTIONITEM *pactionItem;
int end = 0;
-OpenLog(szInst, install.log);
+OpenLog(hwnd, szInst, install.log);
LogMessage(STARTED %s, VERSION);
LogMessage(src=%s support=%s inst=%s,
szSrcDir, szSupport, szInst);
@@ -593,7 +592,7 @@
pactionItem = actionTable;
while (!end) {
- LogMessage(command=%d in=%s out=%s options=%d,
+ LogMessage(command=%d 1in=%s out=%s options=%d,
pactionItem-command,
pactionItem-in ? pactionItem-in : NULL,
pactionItem-out ? pactionItem-out : NULL,
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/08/10 09:06:57 Modified:src/helpers binbuild.sh Log: Fix some changed assumptions in config file format. Submitted by: Tony Finch Reviewed by: Randy Terbush Revision ChangesPath 1.12 +5 -4 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- binbuild.sh 1999/05/02 16:44:24 1.11 +++ binbuild.sh 1999/08/10 16:06:52 1.12 @@ -222,7 +222,7 @@ echo -e \s;[EMAIL PROTECTED]@;\$SR/libexec;\ -e \s;[EMAIL PROTECTED]@;\$SR/include;\ \\ \ echo -e \s;[EMAIL PROTECTED]@;\$SR/conf;\ bindist/bin/apxs \$SR/bin/apxs \ echo sed -e \s;^#!/.*;#!\$PERL;\ bindist/bin/dbmmanage \$SR/bin/dbmmanage \ - echo sed -e \s%/usr/local/apache%\$SR/%\ \$SR/conf/httpd.conf.default \$SR/conf/httpd.conf \ + echo sed -e \s%/usr/local/apache%\$SR%\ \$SR/conf/httpd.conf.default \$SR/conf/httpd.conf \ echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e \s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR\\\%\ bindist/bin/apachectl \$SR/bin/apachectl \ echo\ echo echo \Ready.\ \ @@ -246,9 +246,10 @@ ) install-bindist.sh chmod 755 install-bindist.sh -sed -e s%\/htdocs%\/usr/local/apache/htdocs% \ --e s%\/icons%\/usr/local/apache/icons% \ --e s%\/cgi-bin%\/usr/local/apache/cgi-bin% \ +sed -e s%\htdocs%\/usr/local/apache/htdocs% \ +-e s%\icons%\/usr/local/apache/icons% \ +-e s%\cgi-bin%\/usr/local/apache/cgi-bin% \ +-e s%\proxy%\/usr/local/apache/proxy% \ -e s%^ServerAdmin.*%ServerAdmin [EMAIL PROTECTED] \ -e s%#ServerName.*%#ServerName localhost% \ -e s%Port 8080%Port 80% \
cvs commit: apache-1.3/src ApacheCore.def
randy 99/08/09 08:31:09 Modified:src ApacheCore.def Log: Missed a couple of new exports. Revision ChangesPath 1.18 +2 -0 apache-1.3/src/ApacheCore.def Index: ApacheCore.def === RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ApacheCore.def1999/08/07 20:34:03 1.17 +++ ApacheCore.def1999/08/09 15:31:08 1.18 @@ -344,3 +344,5 @@ ap_server_confname @338 ap_sub_req_method_uri @339 ap_sha1_base64 @340 + ap_puudecode@341 + ap_puuencode@342
cvs commit: apache-1.3/src/ap ap_checkpass.c
randy 99/08/08 11:18:13
Modified:src/ap ap_checkpass.c
Log:
Fix a warning in Win32.
Revision ChangesPath
1.3 +2 -3 apache-1.3/src/ap/ap_checkpass.c
Index: ap_checkpass.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_checkpass.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_checkpass.c1999/08/08 17:57:29 1.2
+++ ap_checkpass.c1999/08/08 18:18:12 1.3
@@ -78,8 +78,8 @@
API_EXPORT(char *) ap_validate_password(const char *passwd, const char *hash)
{
char sample[120];
-char *crypt_pw;
+
/* FreeBSD style MD5 string
*/
if (!strncmp(hash, apr1_id, strlen(apr1_id))) {
@@ -104,8 +104,7 @@
*/
ap_cpystrn(sample, passwd, sizeof(sample) - 1);
#else
- crypt_pw = crypt(passwd, hash);
- ap_cpystrn(sample, crypt_pw, sizeof(sample) - 1);
+ ap_cpystrn(sample, (char *)crypt(passwd, hash), sizeof(sample) - 1);
#endif
}
return (strcmp(sample, hash) == 0) ? NULL : password mismatch;
cvs commit: apache-1.3/src/ap ap_sha1.c
randy 99/08/08 11:18:42
Modified:src/ap ap_sha1.c
Log:
Fix a warning on Win32.
Revision ChangesPath
1.6 +1 -1 apache-1.3/src/ap/ap_sha1.c
Index: ap_sha1.c
===
RCS file: /home/cvs/apache-1.3/src/ap/ap_sha1.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ap_sha1.c 1999/08/08 17:58:34 1.5
+++ ap_sha1.c 1999/08/08 18:18:41 1.6
@@ -240,7 +240,7 @@
const unsigned char *buffer,
unsigned int count)
{
-int i;
+unsigned int i;
if ((sha_info-count_lo + ((AP_LONG) count 3)) sha_info-count_lo) {
++sha_info-count_hi;
cvs commit: apache-1.3/src/support htpasswd.dsp htpasswd.mak
randy 99/08/08 11:20:11
Modified:src/ap ap.dsp ap.mak
src/support htpasswd.dsp htpasswd.mak
Log:
Fix Makefiles for Win32 to accomodate abstraction of authentication API.
Revision ChangesPath
1.7 +4 -0 apache-1.3/src/ap/ap.dsp
Index: ap.dsp
===
RCS file: /home/cvs/apache-1.3/src/ap/ap.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ap.dsp1999/08/07 20:49:17 1.6
+++ ap.dsp1999/08/08 18:20:05 1.7
@@ -114,5 +114,9 @@
SOURCE=.\ap_checkpass.c
# End Source File
+# Begin Source File
+
+SOURCE=.\ap_base64.c
+# End Source File
# End Target
# End Project
1.7 +67 -26apache-1.3/src/ap/ap.mak
Index: ap.mak
===
RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ap.mak1999/08/07 20:34:09 1.6
+++ ap.mak1999/08/08 18:20:05 1.7
@@ -51,6 +51,7 @@
[EMAIL PROTECTED] $(INTDIR)\ap_slack.obj
[EMAIL PROTECTED] $(INTDIR)\ap_snprintf.obj
[EMAIL PROTECTED] $(INTDIR)\ap_sha1.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_base64.obj
[EMAIL PROTECTED] $(INTDIR)\ap_checkpass.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ap.lib
@@ -97,7 +98,7 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ap.bsc
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:$(OUTDIR)\ap.lib
LIB32_OBJS= \
@@ -108,6 +109,7 @@
$(INTDIR)\ap_slack.obj \
$(INTDIR)\ap_snprintf.obj \
$(INTDIR)\ap_sha1.obj \
+ $(INTDIR)\ap_base64.obj \
$(INTDIR)\ap_checkpass.obj
$(OUTDIR)\ap.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
@@ -141,6 +143,7 @@
[EMAIL PROTECTED] $(INTDIR)\ap_slack.obj
[EMAIL PROTECTED] $(INTDIR)\ap_snprintf.obj
[EMAIL PROTECTED] $(INTDIR)\ap_sha1.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_base64.obj
[EMAIL PROTECTED] $(INTDIR)\ap_checkpass.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ap.lib
@@ -187,7 +190,7 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)\ap.bsc
BSC32_SBRS= \
-
+
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:$(OUTDIR)\ap.lib
LIB32_OBJS= \
@@ -198,6 +201,7 @@
$(INTDIR)\ap_slack.obj \
$(INTDIR)\ap_snprintf.obj \
$(INTDIR)\ap_sha1.obj \
+ $(INTDIR)\ap_base64.obj \
$(INTDIR)\ap_checkpass.obj
$(OUTDIR)\ap.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
@@ -227,13 +231,13 @@
..\os\win32\readdir.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_CP=\
..\include\ap_config_auto.h\
..\include\ebcdic.h\
..\include\os.h\
..\include\sfio.h\
-
+
$(INTDIR)\ap_cpystrn.obj : $(SOURCE) $(DEP_CPP_AP_CP) $(INTDIR)
@@ -252,8 +256,8 @@
..\include\util_uri.h\
..\os\win32\os.h\
..\os\win32\readdir.h\
-
+
$(INTDIR)\ap_cpystrn.obj : $(SOURCE) $(DEP_CPP_AP_CP) $(INTDIR)
@@ -272,12 +276,12 @@
..\os\win32\os.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_FN=\
..\include\ap_config_auto.h\
..\include\os.h\
-
+
$(INTDIR)\ap_fnmatch.obj : $(SOURCE) $(DEP_CPP_AP_FN) $(INTDIR)
@@ -290,7 +294,7 @@
..\include\fnmatch.h\
..\include\hsregex.h\
..\os\win32\os.h\
-
+
$(INTDIR)\ap_fnmatch.obj : $(SOURCE) $(DEP_CPP_AP_FN) $(INTDIR)
@@ -315,13 +319,13 @@
..\os\win32\readdir.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_SI=\
..\include\ap_config_auto.h\
..\include\ebcdic.h\
..\include\os.h\
..\include\sfio.h\
-
+
$(INTDIR)\ap_signal.obj : $(SOURCE) $(DEP_CPP_AP_SI) $(INTDIR)
@@ -340,8 +344,8 @@
..\include\util_uri.h\
..\os\win32\os.h\
..\os\win32\readdir.h\
-
+
$(INTDIR)\ap_signal.obj : $(SOURCE) $(DEP_CPP_AP_SI) $(INTDIR)
@@ -366,14 +370,14 @@
..\os\win32\readdir.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
-
+
NODEP_CPP_AP_SL=\
..\include\ap_config_auto.h\
..\include\ebcdic.h\
..\include\os.h\
..\include\sfio.h\
-
+
$(INTDIR)\ap_slack.obj : $(SOURCE) $(DEP_CPP_AP_SL) $(INTDIR)
@@ -392,7 +396,7 @@
..\include\util_uri.h\
..\os\win32\os.h\
..\os\win32\readdir.h\
-
+
$(INTDIR)\ap_slack.obj : $(SOURCE) $(DEP_CPP_AP_SL) $(INTDIR)
@@ -417,14 +421,14 @@
..\os\win32\readdir.h
cvs commit: apache-1.3/src/support htpasswd.c htpasswd.mak
randy 99/08/07 13:34:14
Modified:src ApacheCore.def
src/ap ap.mak
src/support htpasswd.c htpasswd.mak
Log:
Fix build on Win32
Revision ChangesPath
1.17 +1 -1 apache-1.3/src/ApacheCore.def
Index: ApacheCore.def
===
RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ApacheCore.def1999/07/29 17:53:43 1.16
+++ ApacheCore.def1999/08/07 20:34:03 1.17
@@ -343,4 +343,4 @@
ap_standalone @337
ap_server_confname @338
ap_sub_req_method_uri @339
-
+ ap_sha1_base64 @340
1.6 +86 -2 apache-1.3/src/ap/ap.mak
Index: ap.mak
===
RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ap.mak1999/01/19 14:20:40 1.5
+++ ap.mak1999/08/07 20:34:09 1.6
@@ -50,6 +50,8 @@
[EMAIL PROTECTED] $(INTDIR)\ap_signal.obj
[EMAIL PROTECTED] $(INTDIR)\ap_slack.obj
[EMAIL PROTECTED] $(INTDIR)\ap_snprintf.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_sha1.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_checkpass.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ap.lib
@@ -104,7 +106,9 @@
$(INTDIR)\ap_md5c.obj \
$(INTDIR)\ap_signal.obj \
$(INTDIR)\ap_slack.obj \
- $(INTDIR)\ap_snprintf.obj
+ $(INTDIR)\ap_snprintf.obj \
+ $(INTDIR)\ap_sha1.obj \
+ $(INTDIR)\ap_checkpass.obj
$(OUTDIR)\ap.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @
@@ -136,6 +140,8 @@
[EMAIL PROTECTED] $(INTDIR)\ap_signal.obj
[EMAIL PROTECTED] $(INTDIR)\ap_slack.obj
[EMAIL PROTECTED] $(INTDIR)\ap_snprintf.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_sha1.obj
+ [EMAIL PROTECTED] $(INTDIR)\ap_checkpass.obj
[EMAIL PROTECTED] $(INTDIR)\vc50.idb
[EMAIL PROTECTED] $(OUTDIR)\ap.lib
@@ -190,7 +196,9 @@
$(INTDIR)\ap_md5c.obj \
$(INTDIR)\ap_signal.obj \
$(INTDIR)\ap_slack.obj \
- $(INTDIR)\ap_snprintf.obj
+ $(INTDIR)\ap_snprintf.obj \
+ $(INTDIR)\ap_sha1.obj \
+ $(INTDIR)\ap_checkpass.obj
$(OUTDIR)\ap.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @
@@ -480,6 +488,82 @@
!ENDIF
+
+SOURCE=.\ap_checkpass.c
+
+!IF $(CFG) == ap - Win32 Release
+
+DEP_CPP_AP_CH=\
+ ..\include\ap_config.h\
+ ..\include\ap_ctype.h\
+ ..\include\ap_mmn.h\
+ ..\include\hsregex.h\
+ ..\os\win32\os.h\
+ {$(INCLUDE)}sys\stat.h\
+ {$(INCLUDE)}sys\types.h\
+
+NODEP_CPP_AP_CH=\
+ ..\include\ap_config_auto.h\
+ ..\include\os.h\
+ .\ebcdic.h\
+
+
+$(INTDIR)\ap_checkpass.obj : $(SOURCE) $(DEP_CPP_AP_CH) $(INTDIR)
+
+
+!ELSEIF $(CFG) == ap - Win32 Debug
+
+DEP_CPP_AP_CH=\
+ ..\include\ap_config.h\
+ ..\include\ap_ctype.h\
+ ..\include\ap_mmn.h\
+ ..\include\hsregex.h\
+ ..\os\win32\os.h\
+
+
+$(INTDIR)\ap_checkpass.obj : $(SOURCE) $(DEP_CPP_AP_CH) $(INTDIR)
+
+
+!ENDIF
+
+SOURCE=.\ap_sha1.c
+
+!IF $(CFG) == ap - Win32 Release
+
+DEP_CPP_AP_SH=\
+ ..\include\ap_config.h\
+ ..\include\ap_ctype.h\
+ ..\include\ap_sha1.h\
+ ..\include\ap_mmn.h\
+ ..\include\hsregex.h\
+ ..\os\win32\os.h\
+ {$(INCLUDE)}sys\stat.h\
+ {$(INCLUDE)}sys\types.h\
+
+NODEP_CPP_AP_SH=\
+ ..\include\ap_config_auto.h\
+ ..\include\os.h\
+ .\ebcdic.h\
+
+
+$(INTDIR)\ap_sha1.obj : $(SOURCE) $(DEP_CPP_AP_SH) $(INTDIR)
+
+
+!ELSEIF $(CFG) == ap - Win32 Debug
+
+DEP_CPP_AP_SH=\
+ ..\include\ap_config.h\
+ ..\include\ap_ctype.h\
+ ..\include\ap_sha1.h\
+ ..\include\ap_mmn.h\
+ ..\include\hsregex.h\
+ ..\os\win32\os.h\
+
+
+$(INTDIR)\ap_sha1.obj : $(SOURCE) $(DEP_CPP_AP_SH) $(INTDIR)
+
+
+!ENDIF
!ENDIF
1.33 +2 -2 apache-1.3/src/support/htpasswd.c
Index: htpasswd.c
===
RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- htpasswd.c1999/08/02 10:13:48 1.32
+++ htpasswd.c1999/08/07 20:34:14 1.33
@@ -181,7 +181,7 @@
return ERR_PWMISMATCH;
}
pw = pwin;
-bzero(pwv,sizeof(pwin));
+memset(pwv, '\0', sizeof(pwin));
}
switch (alg) {
@@ -213,7 +213,7 @@
ap_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1);
break;
}
-bzero(pw
cvs commit: apache-1.3/src/support htpasswd.dsp
randy 99/08/07 13:49:23 Modified:src/ap ap.dsp src/support htpasswd.dsp Log: Update DSP files. The .mak files in previous commit were created by hand and not from these DSP files. Revision ChangesPath 1.6 +8 -0 apache-1.3/src/ap/ap.dsp Index: ap.dsp === RCS file: /home/cvs/apache-1.3/src/ap/ap.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ap.dsp1999/01/19 14:20:40 1.5 +++ ap.dsp1999/08/07 20:49:17 1.6 @@ -106,5 +106,13 @@ SOURCE=.\ap_md5c.c # End Source File +# Begin Source File + +SOURCE=.\ap_sha1.c +# End Source File +# Begin Source File + +SOURCE=.\ap_checkpass.c +# End Source File # End Target # End Project 1.8 +8 -0 apache-1.3/src/support/htpasswd.dsp Index: htpasswd.dsp === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- htpasswd.dsp 1999/06/30 09:09:44 1.7 +++ htpasswd.dsp 1999/08/07 20:49:23 1.8 @@ -101,6 +101,14 @@ # End Source File # Begin Source File +SOURCE=..\ap\ap_sha1.c +# End Source File +# Begin Source File + +SOURCE=..\ap\ap_checkpass.c +# End Source File +# Begin Source File + SOURCE=.\htpasswd.c # End Source File # End Target
cvs commit: apache-1.3/src/main buff.c http_main.c util.c
randy 99/07/29 11:13:58
Modified:.config.layout
src CHANGES
src/include httpd.h
src/main buff.c http_main.c util.c
Log:
BeOS portability changes.
Submitted by: David Reid [EMAIL PROTECTED]
Reviewed by: Randy Terbush
Revision ChangesPath
1.10 +21 -0 apache-1.3/config.layout
Index: config.layout
===
RCS file: /home/cvs/apache-1.3/config.layout,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config.layout 1999/06/27 04:42:40 1.9
+++ config.layout 1999/07/29 18:12:43 1.10
@@ -129,3 +129,24 @@
logfiledir:$localstatedir/logs
proxycachedir: $localstatedir/proxy
/Layout
+
+# BeOS layout...
+Layout beos
+prefix:/boot/home/apache
+exec_prefix: $prefix
+bindir:$exec_prefix/bin
+sbindir: $exec_prefix/bin
+libexecdir:$exec_prefix/libexec
+mandir:$prefix/man
+sysconfdir:$prefix/conf
+datadir: $prefix
+iconsdir: $datadir/icons
+htdocsdir: $datadir/htdocs
+cgidir:$datadir/cgi-bin
+includedir:$prefix/include
+localstatedir: $prefix
+runtimedir:$localstatedir/logs
+logfiledir:$localstatedir/logs
+proxycachedir: $localstatedir/proxy
+/Layout
+
1.1402+9 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1401
retrieving revision 1.1402
diff -u -r1.1401 -r1.1402
--- CHANGES 1999/07/29 17:53:45 1.1401
+++ CHANGES 1999/07/29 18:13:10 1.1402
@@ -1,5 +1,14 @@
Changes with Apache 1.3.7
+ *) Portability changes for BeOS. [David Reid [EMAIL PROTECTED]
+
+ *) Sanitise Vary values by not adding duplicate keywords. A
+ separate routine needs to be used to do this, so any module
+ that frobs Vary needs to be changed. The standard modules
+ have all been modified. This solution is somewhat inelegant,
+ but it does the job for now. PR#4118 (better fix than before)
+ [Ken Coar, Roy Fielding]
+
*) Link DSO's with gcc -shared instead of ld -Bshareable at
least on Linux and FreeBSD for now.
[Rasmus Lerdorf]
1.286 +2 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- httpd.h 1999/07/19 09:48:24 1.285
+++ httpd.h 1999/07/29 18:13:30 1.286
@@ -85,6 +85,8 @@
#elif defined(WIN32)
/* Set default for Windows file system */
#define HTTPD_ROOT /apache
+#elif defined(BEOS)
+#define HTTPD_ROOT /boot/home/apache
#else
#define HTTPD_ROOT /usr/local/apache
#endif
1.88 +22 -1 apache-1.3/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- buff.c1999/04/27 20:36:30 1.87
+++ buff.c1999/07/29 18:13:40 1.88
@@ -259,6 +259,11 @@
}
else
rv = ap_read(fb, buf, nbyte);
+#elif defined (BEOS)
+if (fb-flags B_SOCKET) {
+rv = recv(fb-fd_in, buf, nbyte, 0);
+} else
+rv = ap_read(fb,buf,nbyte);
#elif defined(TPF)
fd_set fds;
struct timeval tv;
@@ -315,6 +320,11 @@
}
else
rv = ap_write(fb, buf, nbyte);
+#elif defined(BEOS)
+if(fb-flags B_SOCKET) {
+rv = send(fb-fd, buf, nbyte, 0);
+} else
+rv = ap_write(fb, buf,nbyte);
#else
rv = ap_write(fb, buf, nbyte);
#endif /* WIN32 */
@@ -681,6 +691,7 @@
return rv;
}
+
/*
* Read up to nbyte bytes into buf.
* If fewer than byte bytes are currently available, then return those.
@@ -1436,6 +1447,16 @@
rc3 = 0;
}
else {
+#elif defined(BEOS)
+if (fb-flags B_SOCKET) {
+ rc2 = ap_pclosesocket(fb-pool, fb-fd);
+ if (fb-fd_in != fb-fd) {
+ rc3 = ap_pclosesocket(fb-pool, fb-fd_in);
+ }
+ else {
+ rc3 = 0;
+ }
+} else {
#endif
rc2 = ap_pclosef(fb-pool, fb-fd);
if (fb-fd_in != fb-fd) {
@@ -1444,7 +1465,7 @@
else {
rc3 = 0;
}
-#ifdef WIN32
+#if defined(WIN32) || defined (BEOS)
}
#endif
1.465 +25 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache
cvs commit: apache-1.3/htdocs/manual/mod core.html
randy 99/07/29 11:17:48
Modified:htdocs/manual/mod core.html
Log:
Doc changes.
Submitted by: Alan J. Flavell [EMAIL PROTECTED]
Reviewed by: Randy Terbush
Revision ChangesPath
1.154 +30 -25apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- core.html 1999/06/24 16:38:33 1.153
+++ core.html 1999/07/29 18:17:43 1.154
@@ -1321,24 +1321,28 @@
REL=Help
STRONGStatus:/STRONG/A coreP
-lt;Limitgt; and lt;/Limitgt; are used to enclose a group of
-access control directives which will then apply only to the specified
-access methods, where EMmethod/EM is any valid HTTP method.
-Any directive except another lt;Limitgt; or
-A HREF=#directorylt;Directorygt;/A may be used; the majority will be
-unaffected by the lt;Limitgt;. Example:
+Access controls are normally effective for STRONGall/STRONG access
+methods, and this is the usual desired behaviour. STRONGIn the
+general case, access control directives should not be placed within a
+CODElt;limitgt;/CODE section./STRONG
+
+PThe purpose of the lt;Limitgt; directive is to restrict the effect
+of the access controls to the nominated HTTP methods. For all other
+methods, the access restrictions that are enclosed in the
+lt;Limitgt; bracket STRONGwill have no effect/STRONG. The
+following example applies the access control only to the methods POST,
+PUT, and DELETE, leaving all other methods unprotected:
+
BLOCKQUOTECODE
-lt;Limit GET POSTgt;BR
+lt;Limit POST PUT DELETEgt;BR
require valid-userBR
lt;/Limitgt;/CODE/BLOCKQUOTE
-If an access control directive appears outside a lt;Limitgt;
-directive, then it applies to all access methods. The method names
-listed can be one or more of: GET, POST, PUT, DELETE, CONNECT or
-OPTIONS. STRONGThe method name is case-sensitive./STRONG
-If GET is used it will also restrict HEAD requests.
-STRONGIf you wish to limit all methods, do not include any
-lt;Limitgt; directive at all./STRONG
+The method names listed can be one or more of: GET, POST, PUT, DELETE,
+CONNECT, OPTIONS, TRACE, PATCH, PROPFIND, PROPPATCH, MKCOL, COPY,
+MOVE, LOCK, and UNLOCK. STRONGThe method name is
+case-sensitive./STRONG If GET is used it will also restrict HEAD
+requests.
PHR
@@ -2371,24 +2375,25 @@
All valid users can access the directory.
/UL
P
-If CODErequire/CODE appears in a A HREF=#limitlt;Limitgt;/A
-section, then it restricts access to the named methods, otherwise
-it restricts access for all methods. Example:
+Require must be accompanied by A HREF=#authnameAuthName/A and
+A HREF=#authtypeAuthType/A directives, and directives such as
+A HREF=mod_auth.html#authuserfileAuthUserFile/A and
+A HREF=mod_auth.html#authgroupfileAuthGroupFile/A (to define users and
+groups) in order to work correctly. Example:
BLOCKQUOTECODE
AuthType BasicBR
-AuthName somedomainBR
+AuthName Restricted DirectoryBR
AuthUserFile /web/usersBR
AuthGroupFile /web/groupsBR
-lt;Limit GET POSTgt;BR
require group adminBR
-lt;/Limitgt;
/CODE/BLOCKQUOTE
-Require must be accompanied by A HREF=#authnameAuthName/A and
-A HREF=#authtypeAuthType/A directives, and directives such as
-A HREF=mod_auth.html#authuserfileAuthUserFile/A and
-A HREF=mod_auth.html#authgroupfileAuthGroupFile/A (to define users and
-groups) in order to work correctly.PHR
+Access controls which are applied in this way are effective for
+STRONGall/STRONG methods. STRONGThis is what is normally
+desired./STRONG If you wish to apply access controls only to
+specific methods, while leaving other methods unprotected, then place
+the CODErequire/CODE statement into a A
+HREF=#limitlt;Limitgt;/A sectionPHR
H2A NAME=resourceconfigResourceConfig directive/A/H2
!--%plaintext lt;?INDEX {\tt ResourceConfig} directivegt; --
cvs commit: apache-1.3/src/main http_main.c
randy 99/06/22 14:55:31
Modified:src CHANGES Configure
src/helpers TestCompile
Log:
Add support for DSO on DGUX using gcc. Tested on x86 platforms.
Revision ChangesPath
1.1384+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1383
retrieving revision 1.1384
diff -u -r1.1383 -r1.1384
--- CHANGES 1999/06/22 00:51:26 1.1383
+++ CHANGES 1999/06/22 21:54:41 1.1384
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Add DSO support for DGUX 4.x using gcc. Tested on x86 platforms.
+ [Randy Terbush [EMAIL PROTECTED]]
+
*) Add the new mass-vhost module (mod_vhost_alias.c) developed and
used by Demon Internet, LTD. [Tony Finch [EMAIL PROTECTED]]
1.356 +12 -3 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- Configure 1999/06/18 07:53:38 1.355
+++ Configure 1999/06/22 21:54:42 1.356
@@ -1190,6 +1190,14 @@
SHCORE_IMPLIB='ApacheCoreOS2.a'
OS_MODULE_INCLUDE='Makefile.OS2'
;;
+ *-dgux)
+ case $CC in
+ */gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
+ esac
+ DEF_SHARED_CORE=yes
+ LDFLAGS_SHLIB=-G
+ LDFLAGS_SHLIB_EXPORT=
+;;
*)
## ok, no known explict support for shared objects
## on this platform, but we give not up immediately.
@@ -1358,11 +1366,12 @@
*-dg-dgux*)
# R4.11MU02 requires -lsocket -lnsl ... no idea if it's earlier or
# later than what we already knew about. PR#732
- if ./helpers/TestCompile lib socket; then
- LIBS=$LIBS -lsocket
- fi
if ./helpers/TestCompile lib nsl; then
LIBS=$LIBS -lnsl
+ TLIB='-lnsl'
+ fi
+ if TLIB=$TLIB ./helpers/TestCompile lib socket; then
+ LIBS=-lsocket $LIBS
fi
;;
esac
1.32 +1 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TestCompile 1999/06/09 10:45:02 1.31
+++ TestCompile 1999/06/22 21:54:54 1.32
@@ -77,7 +77,7 @@
if [ x$2 = x ]; then
exit
fi
- TLIB=-l$2
+ TLIB=-l$2 $TLIB
if [ x$VERBOSE = xyes ]; then
ERRDIR=
else
Modified:src/main http_main.c
Log:
Add some more debug info.
Revision ChangesPath
1.448 +4 -4 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- http_main.c 1999/06/22 00:51:30 1.447
+++ http_main.c 1999/06/22 21:55:25 1.448
@@ -3660,7 +3660,7 @@
if (setuid(ap_user_id) == -1) {
GETUSERMODE();
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- setuid: unable to change uid);
+ setuid: unable to change to uid: %d, ap_user_id);
exit(1);
}
GETUSERMODE();
@@ -3673,7 +3673,7 @@
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- setuid: unable to change uid);
+ setuid: unable to change to uid: %d, ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -4823,7 +4823,7 @@
if (setuid(ap_user_id) == -1) {
GETUSERMODE();
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- setuid: unable to change uid);
+ setuid: unable to change to uid: %d, ap_user_id);
exit(1);
}
GETUSERMODE();
@@ -4832,7 +4832,7 @@
/* Only try to switch if we're running as root */
if (!geteuid() setuid(ap_user_id) == -1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- setuid: unable to change uid);
+ setuid: unable to change to uid: %d, ap_user_id);
exit(1);
}
#endif
cvs commit: apache-1.3 configure
randy 99/06/17 10:45:00 Modified:.configure Log: Correct some english grammar. Revision ChangesPath 1.93 +4 -4 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- configure 1999/05/17 07:09:06 1.92 +++ configure 1999/06/17 17:44:59 1.93 @@ -991,14 +991,14 @@ exit 1 fi if [ x`$aux/getuid.sh` != x0 ]; then -echo + Warning: You enabled the suEXEC feature. Be aware that you need 12 -echo + root privileges for this, at the latest at the installation step. 12 +echo + Warning: You have enabled the suEXEC feature. Be aware that you need 12 +echo + root privileges to complete the final installation step. 12 fi fi if [ x$PERL = xno-perl-on-this-system ]; then if [ x$quiet = xno ]; then -echo + Warning: no Perl interpreter available for support scripts. -echo + Perhaps you have to select one with --with-perl=FILE. +echo + Warning: no Perl interpreter detected for support scripts. +echo + Perhaps you need to specify one with --with-perl=FILE. fi fi
cvs commit: apache-1.3 STATUS
randy 99/06/05 08:38:29 Modified:.STATUS Log: Traveling is good for productivity... Revision ChangesPath 1.703 +5 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.702 retrieving revision 1.703 diff -u -r1.702 -r1.703 --- STATUS1999/06/05 12:08:45 1.702 +++ STATUS1999/06/05 15:38:28 1.703 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/05 12:08:45 $] + Last modified at [$Date: 1999/06/05 15:38:28 $] Release: @@ -109,12 +109,12 @@ * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package Message-ID: [EMAIL PROTECTED] - Status: Jim +1, Mark +1, Dean +1, BenH +1 + Status: Jim +1, Mark +1, Dean +1, BenH +1, Randy +1 (please choose name other than hook) Doug +1 on concept (untested), Lars +1 on concept * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED] - Status: Dean +1 + Status: Dean +1, Randy +1 * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) @@ -124,11 +124,11 @@ * Aidan Cully's patch to allow assignment of 'ownership' of resources to either the server UID or the file's owner. Message-ID: [EMAIL PROTECTED] - Status: Ken +1, Dean +1 + Status: Ken +1, Dean +1, Randy +1 * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: [EMAIL PROTECTED] - Status: Ken +1, Dean +1 + Status: Ken +1, Dean +1, Randy +1 * Keith Wannamaker's NT multiple services patch Message-ID: [EMAIL PROTECTED]
cvs commit: apache-1.3/htdocs/manual dso.html
randy 99/05/03 15:47:09 Modified:htdocs/manual dso.html Log: Update some supported platforms. Revision ChangesPath 1.11 +4 -4 apache-1.3/htdocs/manual/dso.html Index: dso.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/dso.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dso.html 1998/12/06 16:14:19 1.10 +++ dso.html 1999/05/03 22:47:08 1.11 @@ -174,15 +174,15 @@ (actually tested versions in parenthesis) PRE -o FreeBSD(2.1.5, 2.2.5, 2.2.6) +o FreeBSD(2.1.5, 2.2.x, 3.x, 4.x) o OpenBSD(2.x) o NetBSD (1.3.1) -o BSDI (4.0) +o BSDI (3.x, 4.x) o Linux (Debian/1.3.1, RedHat/4.2) -o Solaris(2.4, 2.5.1, 2.6) +o Solaris(2.4, 2.5, 2.6, 2.7) o SunOS (4.1.3) o Digital UNIX (4.0) -o IRIX (6.2) +o IRIX (5.3, 6.2) o HP/UX (10.20) o UnixWare (2.01, 2.1.2) o SCO(5.0.4)
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/05/01 19:58:08
Modified:src CHANGES
src/helpers binbuild.sh
Log:
Add functionality to the install-bindist.sh script created by
binbuild.sh to use tar when copying distribution files to the
serverroot. This allows upgrading an existing installation
without nesting the new distribution in the old.
install-bindist.sh now detects the local perl5 path to install
apxs and dbmmanage with proper path to perl interpreter.
Add an install-binsupport target which copies the source files
for apxs and dbmmanage to bindist to allow these scripts to
be properly installed relative to the destination serverroot.
FWIW - abort during commit for changed files commited without
comments.
Revision ChangesPath
1.1339+13 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1338
retrieving revision 1.1339
diff -u -r1.1338 -r1.1339
--- CHANGES 1999/05/01 17:03:48 1.1338
+++ CHANGES 1999/05/02 02:57:59 1.1339
@@ -1,5 +1,18 @@
Changes with Apache 1.3.7
+ *) Add functionality to the install-bindist.sh script created by
+ binbuild.sh to use tar when copying distribution files to the
+ serverroot. This allows upgrading an existing installation
+ without nesting the new distribution in the old.
+
+ install-bindist.sh now detects the local perl5 path to install
+ apxs and dbmmanage with proper path to perl interpreter.
+
+ Add an install-binsupport target which copies the source files
+ for apxs and dbmmanage to bindist to allow these scripts to
+ be properly installed relative to the destination serverroot.
+ [Randy Terbush, Covalent Technologies, [EMAIL PROTECTED]
+
*) Fix intermittent SEGV in ap_proxy_cache_error() in
src/modules/proxy_util.c where a NULL filepointer and
temporary filename were closed and unlinked.
1.10 +68 -14apache-1.3/src/helpers/binbuild.sh
Index: binbuild.sh
===
RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- binbuild.sh 1999/03/22 23:41:40 1.9
+++ binbuild.sh 1999/05/02 02:58:07 1.10
@@ -129,6 +129,55 @@
echo # This script installs the Apache binary distribution and \
echo # was automatically created by binbuild.sh. \
echo\
+ echo lmkdir() \
+ echo { \
+ echo path=\\ \
+ echo dirs=\`echo \$1 | sed -e 's%/% %g'\` \
+ echo mode=\$2 \
+ echo\
+ echo set -- \${dirs} \
+ echo\
+ echo for d in \${dirs} \
+ echo do \
+ echo path=\\${path}/\$d\ \
+ echo if test ! -d \\${path}\ ; then \
+ echo mkdir \${path} \
+ echo if test \$? -ne 0 ; then \
+ echo echo \Failed to create directory: \${path}\ \
+ echo exit 1 \
+ echo fi \
+ echo chmod \${mode} \${path} \
+ echo fi \
+ echo done \
+ echo } \
+ echo\
+ echo lcopy() \
+ echo { \
+ echo from=\$1 \
+ echo to=\$2 \
+ echo dmode=\$3 \
+ echo fmode=\$4 \
+ echo\
+ echo test -d \${to} || lmkdir \${to} \${dmode} \
+ echo (cd \${from} tar -cf - *) | (cd \${to} tar -xf -) \
+ echo\
+ echo if test \X\${fmode}\ != X ; then \
+ echo find \${to} -type f -print | xargs chmod \${fmode} \
+ echo fi \
+ echo if test \X\${dmode}\ != X ; then \
+ echo find \${to} -type d -print | xargs chmod \${dmode} \
+ echo fi \
+ echo } \
+ echo\
+ echo ## \
+ echo ## determine path to (optional) Perl interpreter \
+ echo ## \
+ echo PERL=no-perl-on-this-system \
+ echo perlpath=\\`src/helpers/PrintPath perl5 perl miniperl\`\ \
+ echo if [ \x\$perlpath\ != \x\ ]; then \
+ echo PERL=\\$perlpath\ \
+ echo fi \
+ echo\
echo if [ .\$1 = . ] \
echo then \
echo SR=/usr/local/apache \
@@ -138,27 +187,32 @@
echo echo \Installing binary distribution for platform $OS\ \
echo echo \into directory \$SR ...\ \
echo ./src/helpers/mkdir.sh \$SR \
- echo cp -r bindist/proxy \$SR/proxy \
- echo cp -r bindist/man \$SR/man \
- echo cp -r bindist/logs \$SR/logs \
- echo cp -r bindist/libexec \$SR/libexec \
- echo cp -r bindist/include \$SR/include \
- echo cp -r bindist/icons \$SR/icons \
- echo cp -r bindist/cgi-bin \$SR/cgi-bin \
- echo cp -r bindist/bin \$SR/bin \
+ echo lmkdir \$SR/proxy 750 \
+ echo lmkdir \$SR/logs 750 \
+ echo lcopy bindist/man \$SR/man 755 644 \
+ echo lcopy bindist/libexec \$SR/libexec 750 644 \
+ echo lcopy bindist/include \$SR/include 755
cvs commit: apache-1.3 Makefile.tmpl
randy 99/05/02 07:37:06
Modified:.Makefile.tmpl
Log:
Revision ChangesPath
1.78 +4 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- Makefile.tmpl 1999/05/02 02:56:02 1.77
+++ Makefile.tmpl 1999/05/02 14:37:06 1.78
@@ -384,7 +384,10 @@
apachectl=$(TARGET)ctl; \
fi; \
echo $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*]
$(root)$(sbindir)/$${apachectl}; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl
$(root)$(sbindir)/$${apachectl}; \
+ sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
+ -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
+ $(TOP)/$(SRC)/support/apachectl
$(TOP)/$(SRC)/.apaci.install.tmp \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(sbindir)/$${apachectl}; \
echo $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd
$(root)$(bindir)/htpasswd
cvs commit: apache-1.3 Makefile.tmpl
randy 99/05/02 07:40:36
Modified:.Makefile.tmpl
Log:
Reverse previous commit.
NOTICE: attempt to abort previous commit failed with cvs continuing to
commit changes despite a quite from the editory.
Revision ChangesPath
1.79 +1 -4 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- Makefile.tmpl 1999/05/02 14:37:06 1.78
+++ Makefile.tmpl 1999/05/02 14:40:36 1.79
@@ -384,10 +384,7 @@
apachectl=$(TARGET)ctl; \
fi; \
echo $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*]
$(root)$(sbindir)/$${apachectl}; \
- sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
- -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
- $(TOP)/$(SRC)/support/apachectl
$(TOP)/$(SRC)/.apaci.install.tmp \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(sbindir)/$${apachectl}; \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl
$(root)$(sbindir)/$${apachectl}; \
echo $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd
$(root)$(bindir)/htpasswd
cvs commit: apache-1.3/src/helpers binbuild.sh
randy 99/05/02 09:44:25
Modified:.Makefile.tmpl
Log:
I've waffled back and forth on whether we should be processing the source
of this script at all for bindist. The whole binary distribution thing
seems somewhat bipolar.
Make this script look like what install-bindist.sh expects. Doing this
here might make paths for binary distributions somewhat more flexible.
(might)
Revision ChangesPath
1.80 +4 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- Makefile.tmpl 1999/05/02 14:40:36 1.79
+++ Makefile.tmpl 1999/05/02 16:42:30 1.80
@@ -384,7 +384,10 @@
apachectl=$(TARGET)ctl; \
fi; \
echo $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*]
$(root)$(sbindir)/$${apachectl}; \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl
$(root)$(sbindir)/$${apachectl}; \
+ sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
+ -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
+ $(TOP)/$(SRC)/support/apachectl
$(TOP)/$(SRC)/.apaci.install.tmp \
+ $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp
$(root)$(sbindir)/$${apachectl}; \
echo $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8; \
$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8
$(root)$(mandir)/man8/$${apachectl}.8
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd
$(root)$(bindir)/htpasswd
Modified:src/helpers binbuild.sh
Log:
Make the install-bindist.sh script standalone. (don't require src/helpers)
This could allow us to do binary distributions without source if we choose
to.
PERL detection now makes sure it is perl5 since the 2 scripts in question
(dbmmanage and apxs) require perl5.
Fix some breakage I introduced when creating apachectl.
Revision ChangesPath
1.11 +17 -8 apache-1.3/src/helpers/binbuild.sh
Index: binbuild.sh
===
RCS file: /home/cvs/apache-1.3/src/helpers/binbuild.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- binbuild.sh 1999/05/02 02:58:07 1.10
+++ binbuild.sh 1999/05/02 16:44:24 1.11
@@ -172,11 +172,20 @@
echo ## \
echo ## determine path to (optional) Perl interpreter \
echo ## \
- echo PERL=no-perl-on-this-system \
- echo perlpath=\\`src/helpers/PrintPath perl5 perl miniperl\`\ \
- echo if [ \x\$perlpath\ != \x\ ]; then \
- echo PERL=\\$perlpath\ \
- echo fi \
+ echo PERL=no-perl5-on-this-system \
+ echo perls='perl5 perl' \
+ echo path=\`echo \$PATH | sed -e 's/:/ /g'\` \
+ echo\
+ echo for dir in \${path} ; do \
+ echo for pperl in \${perls} ; do \
+ echo if test -f \\${dir}/\${pperl}\ ; then \
+ echo if \`\${dir}/\${pperl} -v | grep 'version 5\.' /dev/null
21\` ; then \
+ echo PERL=\\${dir}/\${pperl}\ \
+ echo break \
+ echo fi \
+ echo fi \
+ echo done \
+ echo done \
echo\
echo if [ .\$1 = . ] \
echo then \
@@ -186,7 +195,7 @@
echo fi \
echo echo \Installing binary distribution for platform $OS\ \
echo echo \into directory \$SR ...\ \
- echo ./src/helpers/mkdir.sh \$SR \
+ echo lmkdir \$SR 755 \
echo lmkdir \$SR/proxy 750 \
echo lmkdir \$SR/logs 750 \
echo lcopy bindist/man \$SR/man 755 644 \
@@ -213,8 +222,8 @@
echo -e \s;[EMAIL PROTECTED]@;\$SR/libexec;\ -e \s;[EMAIL
PROTECTED]@;\$SR/include;\ \\ \
echo -e \s;[EMAIL PROTECTED]@;\$SR/conf;\ bindist/bin/apxs
\$SR/bin/apxs \
echo sed -e \s;^#!/.*;#!\$PERL;\ bindist/bin/dbmmanage
\$SR/bin/dbmmanage \
- echo sed -e s%/usr/local/apache%\$SR/% \$SR/conf/httpd.conf.default
\$SR/conf/httpd.conf \
- echo sed -e s%PIDFILE=%PIDFILE=\$SR/% -e s%HTTPD=%HTTPD=$SR/% -e
\s%/httpd$%/httpd -d \$SR\\\%\ bindist/bin/apachectl \$SR/bin/apachectl
\
+ echo sed -e \s%/usr/local/apache%\$SR/%\ \$SR/conf/httpd.conf.default
\$SR/conf/httpd.conf \
+ echo sed -e \s%PIDFILE=%PIDFILE=\$SR/%\ -e
\s%HTTPD=%HTTPD=$SR/%\ -e \s%httpd\$%httpd -d \$SR\\\%\
bindist/bin/apachectl \$SR/bin/apachectl \
echo\
echo echo \Ready.\ \
echo echo \
++\ \
cvs commit: apache-site related_projects.html
randy 99/04/23 16:03:35 Modified:.related_projects.html Log: Changes Revision ChangesPath 1.39 +2 -3 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- related_projects.html 1999/03/16 21:35:52 1.38 +++ related_projects.html 1999/04/23 23:03:33 1.39 @@ -40,7 +40,7 @@ UL LIA HREF=#apacheweekApache Week/A (free weekly newsletter) -LIA HREF=#ravenCovalent Raven/A +LIA HREF=#ravenCovalent Raven SSL module/A LIA HREF=#ibmIBM HTTP Server powered by Apache/A LIA HREF=#matriceMatrice W3/A LIA HREF=#redhatRed Hat Secure Server/a @@ -95,8 +95,7 @@ purposes for free. PHR -H3A NAME=raven HREF=http://raven.covalent.net/; -Covalent Raven - SSL Module for Apache/A/H3 +H3A NAME=raven HREF=http://ravenssl.com/;Covalent Raven SSL Module for Apache/A/H3 The Raven SSL module is a commerical product providing a strong cryptography upgrade to the Apache web server using the A
cvs commit: apache-1.3/src/helpers GuessOS
randy 99/03/29 22:19:17
Modified:.STATUS
src CHANGES Configure
src/helpers GuessOS
Log:
Fix DSO builds on BSD/OS 3.x. Must use native shlicc2 compiler.
[Randy Terbush, Covalent Technologies]
Revision ChangesPath
1.681 +1 -14 apache-1.3/STATUS
Index: STATUS
===
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -r1.680 -r1.681
--- STATUS1999/03/27 22:43:29 1.680
+++ STATUS1999/03/30 06:18:58 1.681
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/03/27 22:43:29 $]
+ Last modified at [$Date: 1999/03/30 06:18:58 $]
Release:
@@ -74,19 +74,6 @@
= When I find time, I can look at this. But I would appreciate
when someone other already can dive into this. My opinion
is already appended to the PR.
-
-* Randy's proposed changes for binbuild:
-
- 1. Change to build binary only distribution
- Lars: -0
-
- 2. Add 'make dist' target to call binbuild.sh
- [Roy: That would require a Makefile, which is what binbuild creates.
- I don't see any point in that.]
- Lars: -1 (Roy explained why)
-
- 3. Create toplevel 'setup' script for install to mirror win32 name
- [It is currently creating install-bindist.sh]
* long pathnames with many components and no AllowOverride None
Workaround is to define Directory / with AllowOverride None,
1.1295+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -r1.1294 -r1.1295
--- CHANGES 1999/03/25 19:56:44 1.1294
+++ CHANGES 1999/03/30 06:19:06 1.1295
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Add support for DSO module compilation on BSD/OS 3.x.
+ [Randy Terbush, Covalent Technologies]
+
*) Fix sed-substitutions in `make install': path elements like `httpd/conf'
(for instance from an APACI configure --sysconfdir=/etc/httpd/conf
option) were substituted with $(TARGET).conf, etc. Same for other
strings
1.336 +9 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- Configure 1999/03/24 09:23:54 1.335
+++ Configure 1999/03/30 06:19:07 1.336
@@ -437,6 +437,11 @@
DBM_LIB=
DB_LIB=
;;
+*-bsdi3)
+if [ x$using_shlib = x1 ] ; then
+CC=shlicc2
+fi
+;;
*-bsdi*)
OS='BSDI'
DBM_LIB=
@@ -984,6 +989,10 @@
LDFLAGS_SHLIB=-Bshareable
LDFLAGS_SHLIB_EXPORT=
SHLIB_SUFFIX_DEPTH=2
+ ;;
+ *-bsdi3)
+ LD_SHLIB=shlicc2
+ LDFLAGS_SHLIB=-r
;;
*-bsdi)
CFLAGS_SHLIB=-fPIC
1.58 +5 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- GuessOS 1999/02/07 23:26:51 1.57
+++ GuessOS 1999/03/30 06:19:17 1.58
@@ -114,7 +114,11 @@
echo i486-whatever-bsdi; exit 0
;;
-BSD/386:*|BSD/OS:*)
+ BSD/386|BSD/OS:3.*)
+ echo ${MACHINE}-whatever-bsdi3; exit 0
+ ;;
+
+ BSD/386:*|BSD/OS:*)
echo ${MACHINE}-whatever-bsdi; exit 0
;;
cvs commit: apache-1.3/src/support htdigest.c
randy 99/01/17 14:30:31 Modified:src/support htdigest.c Log: Portability for QNX 4.24. Revision ChangesPath 1.21 +1 -1 apache-1.3/src/support/htdigest.c Index: htdigest.c === RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- htdigest.c1999/01/12 22:34:57 1.20 +++ htdigest.c1999/01/17 22:30:31 1.21 @@ -12,7 +12,7 @@ #include ap_config.h #include sys/types.h -#ifdef MPE +#if defined(MPE) || defined(QNX) #include signal.h #else #include sys/signal.h
cvs commit: apache-1.3/src/support ab.c
randy 99/01/03 20:13:14
Modified:src Configure
Log:
Portability fixes for QNX32. This may also apply to QNX, but I cannot
verify that. /bin/sh is pathetic on this platform so configuration
still requires a replacement shell.
Revision ChangesPath
1.319 +1 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- Configure 1999/01/02 23:54:34 1.318
+++ Configure 1999/01/04 04:11:38 1.319
@@ -497,6 +497,7 @@
DEF_WANTHSREGEX=yes
;;
*-qnx32)
+CC='cc -F'
OS='QNX32'
CFLAGS=$CFLAGS -DQNX -mf -3
LIBS=$LIBS -N128k -lsocket -lunix
Modified:src/support ab.c
Log:
Portability fixes for QNX32. This change seems to be the most
portable way to handle the conflict with this macro in other
included files.
Revision ChangesPath
1.18 +6 -6 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ab.c 1999/01/01 19:05:32 1.17
+++ ab.c 1999/01/04 04:13:13 1.18
@@ -155,8 +155,8 @@
int time; /* time in ms for connection */
};
-#define min(a,b) ((a)(b))?(a):(b)
-#define max(a,b) ((a)(b))?(a):(b)
+#define ap_min(a,b) ((a)(b))?(a):(b)
+#define ap_max(a,b) ((a)(b))?(a):(b)
/* - GLOBALS */
@@ -320,10 +320,10 @@
for (i = 0; i requests; i++) {
struct data s = stats[i];
-mincon = min(mincon, s.ctime);
-mintot = min(mintot, s.time);
-maxcon = max(maxcon, s.ctime);
-maxtot = max(maxtot, s.time);
+mincon = ap_min(mincon, s.ctime);
+mintot = ap_min(mintot, s.time);
+maxcon = ap_max(maxcon, s.ctime);
+maxtot = ap_max(maxtot, s.time);
totalcon += s.ctime;
total += s.time;
}
cvs commit: apache-1.3 configure
randy 98/12/29 22:10:04 Modified:.configure Log: Shell compatibility change to allow this to work with QNX's /bin/sh when not specifying any command line arguments. Revision ChangesPath 1.64 +5 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- configure 1998/12/16 15:57:28 1.63 +++ configure 1998/12/30 06:10:03 1.64 @@ -252,7 +252,11 @@ *--with-layout=* ) ;; * ) -set -- '--with-layout=Apache' $@ +if [ x$@ = x ]; then +set -- '--with-layout=Apache' +else +set -- '--with-layout=Apache' $@ +fi ;; esac
cvs commit: apache-1.3 Makefile.tmpl configure
randy 98/12/13 17:03:32
Modified:.Makefile.tmpl configure
Log:
Pattern matches changed to allow --enable-shared=blah_blah.module
Revision ChangesPath
1.55 +1 -1 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile.tmpl 1998/12/13 02:08:58 1.54
+++ Makefile.tmpl 1998/12/14 01:03:31 1.55
@@ -286,7 +286,7 @@
sed -e 's:SharedModule:AddModule:' \
-e 's:modules/[^/]*/::' \
-e 's:[ ]lib: mod_:' \
- -e 's:\.[soa]*$$:.c:' $(SRC)/.apaci.install.conf; \
+ -e 's:\.[soam].*$$:.c:' $(SRC)/.apaci.install.conf; \
fi
@echo === [programs]
1.61 +3 -4 apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- configure 1998/12/13 22:43:07 1.60
+++ configure 1998/12/14 01:03:31 1.61
@@ -234,8 +234,7 @@
fi
module=`echo $module |\
sed -e 's%^.*/\(.*\)$%\1%' \
--e 's/\.[oa]$//' \
--e 's/\.module$//' \
+-e 's/\.[oam].*$//' \
-e 's/^mod_//' \
-e 's/^lib//'`
eval module_$module=$add
@@ -1161,7 +1160,7 @@
for line in `cat src/Configuration.tmpl $addconf | egrep '^[#
]*(Add|Shared)Module'`; do
name=`echo $line |\
sed -e 's%^.*/\(.*\)$%\1%' \
- -e 's/\.[oa]$//' \
+ -e 's/\.[oam].*$//' \
-e 's/^mod_//' \
-e 's/^lib//'`
echo ${name}:${line}
@@ -1239,7 +1238,7 @@
fi
eval share=\$shared_$module
if [ $share = yes ]; then
-echo $SEO
s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oa]\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
+echo $SEO
s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
m=yes [shared]
fi
if [ $verbose = yes ]; then
cvs commit: apache-1.3 Makefile.tmpl
randy 98/12/13 17:11:35
Modified:.Makefile.tmpl
Log:
Change to '' for sed patterns where we need to expand the variables.
Revision ChangesPath
1.56 +4 -4 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Makefile.tmpl 1998/12/14 01:03:31 1.55
+++ Makefile.tmpl 1998/12/14 01:11:35 1.56
@@ -412,10 +412,10 @@
-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
-e
's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
- -e
's;logs/access_log;$(logfiledir)/$${target_prefix}access_log;' \
- -e
's;logs/error_log;$(logfiledir)/$${target_prefix}error_log;' \
- -e
's;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;' \
- -e
's;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;' \
+ -e
s;logs/access_log;$(logfiledir)/$${target_prefix}access_log; \
+ -e
s;logs/error_log;$(logfiledir)/$${target_prefix}error_log; \
+ -e
s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log; \
+ -e
s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log; \
-e 's;conf/magic;$(sysconfdir)/magic;' \
-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
-e 's;Group #-1;Group $(conf_group);' \
cvs commit: apache-1.3 configure
randy 98/12/13 14:43:08 Modified:.configure Log: Recognize .module config files as does Configure. Revision ChangesPath 1.60 +1 -0 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- configure 1998/12/12 18:22:47 1.59 +++ configure 1998/12/13 22:43:07 1.60 @@ -235,6 +235,7 @@ module=`echo $module |\ sed -e 's%^.*/\(.*\)$%\1%' \ -e 's/\.[oa]$//' \ +-e 's/\.module$//' \ -e 's/^mod_//' \ -e 's/^lib//'` eval module_$module=$add
cvs commit: apache-1.3 configure
randy 98/12/09 12:51:41 Modified:.configure Log: Modify recent --with-layout option to set these variables first from the config.layout file (or specified file) and allow the any other configuration arguments to override portions of that layout. ie. --prefix etc. Revision ChangesPath 1.58 +69 -44apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- configure 1998/12/06 15:40:51 1.57 +++ configure 1998/12/09 20:51:39 1.58 @@ -263,10 +263,8 @@ IFS=$OIFS ## -## parse argument line options +## preprocess path layout definititions so that these can be overriden ## - -addconf_created=0 apc_prev= OIFS1=$IFS IFS=$DIFS for apc_option @@ -283,6 +281,74 @@ *) apc_optarg= ;; esac +case $apc_option in +--with-layout=*|--compat) + if [ .$apc_option = .--compat ]; then +apc_optarg=Apache +fi +case $apc_optarg in +*:* ) +file=`echo $apc_optarg | sed -e 's/:.*//'` +name=`echo $apc_optarg | sed -e 's/.*://'` +;; +* ) +name=$apc_optarg +file=$configlayout +;; +esac +if [ ! -f $file ]; then +echo configure:Error: Path layout definition file $file not found 12 +exit 1 +fi +sed -e 1,/[ ]*[Ll]ayout[ ]*$name[]*[]*/d \ +-e '/[ ]*\/Layout[ ]*/,$d' \ +-e s/^[ ]*//g \ +-e s/:[ ]*/=\'/g \ +-e s/[ ]*$/'/g \ +$file $pldconf +. $pldconf +rm -f $pldconf 2/dev/null +if [ .$prefix = .UNSET ]; then +echo configure:Error: Path layout definition not found or incorrect 12 +exit 1 +fi +if [ .$quiet = .no ]; then +echo + using installation path layout: $name ($file) +fi +with_layout=1 +;; + *) + args=$apc_option $args +;; +esac +done + +if [ .$with_layout = .0 ]; then +echo configure:Error: Please select an installation path layout with +echo the --with-layout=[FILE:]ID option. Use 'Apache' or +echo 'GNU' for ID to select the two predefined layouts. +exit 1 +fi + +## +## parse argument line options +## +addconf_created=0 +apc_prev= +OIFS1=$IFS IFS=$DIFS +for apc_option in $args +do +# if previous option needs an argument, assign it. +if [ .$apc_prev != . ]; then +eval $apc_prev=\$apc_option +apc_prev= +continue +fi +# split out arguments +case $apc_option in +-*=*) apc_optarg=`echo $apc_option | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) apc_optarg= ;; +esac # accept only the most important GNU Autoconf-style options case $apc_option in --quiet | --silent) @@ -415,41 +481,6 @@ echo --compat backward compat only: use --with-layout=Apache exit 0 ;; ---with-layout=*|--compat) -if [ .$apc_option = .--compat ]; then -apc_optarg=Apache -fi -case $apc_optarg in -*:* ) -file=`echo $apc_optarg | sed -e 's/:.*//'` -name=`echo $apc_optarg | sed -e 's/.*://'` -;; -* ) -name=$apc_optarg -file=$configlayout -;; -esac -if [ ! -f $file ]; then -echo configure:Error: Path layout definition file $file not found 12 -exit 1 -fi -sed -e 1,/[ ]*[Ll]ayout[ ]*$name[]*[]*/d \ --e '/[ ]*\/Layout[ ]*/,$d' \ --e s/^[ ]*//g \ --e s/:[ ]*/=\'/g \ --e s/[ ]*$/'/g \ -$file $pldconf -. $pldconf -rm -f $pldconf 2/dev/null -if [ .$prefix = .UNSET ]; then -echo configure:Error: Path layout definition not found or incorrect 12 -exit 1 -fi -if [ .$quiet = .no ]; then -echo + using installation path layout: $name ($file) -fi -with_layout=1
cvs commit: apache-1.3/src/helpers TestCompile
randy 98/12/09 13:26:20
Modified:src Configure
src/helpers TestCompile
Log:
Fix a rare case where our use of 'make' would fail or yield bogus
results if Configure was called from a Makefile shell. Default to 'make'
if MAKE is not in the enviroment.
Revision ChangesPath
1.311 +8 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- Configure 1998/12/06 16:14:17 1.310
+++ Configure 1998/12/09 21:26:14 1.311
@@ -744,6 +744,13 @@
esac
+## set this if we haven't
+##
+if [ .${MAKE} = . ]; then
+MAKE='make'; export MAKE
+fi
+
+
## Show user what OS we came up with
##
echo + configured for $OS platform
@@ -1725,7 +1732,7 @@
## it uses ugly looking built-in directory walk messages
## while we are already using our own messages
##
-if [ x`make -v 2/dev/null | grep 'GNU Make'` = x ]; then
+if [ x`${MAKE} -v 2/dev/null | grep 'GNU Make'` = x ]; then
MFLAGS_STATIC=
else
MFLAGS_STATIC=--no-print-directory
1.22 +1 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TestCompile 1998/12/03 01:03:46 1.21
+++ TestCompile 1998/12/09 21:26:19 1.22
@@ -143,7 +143,7 @@
EOF
# Now run that Makefile
-eval make $TARGET /dev/null $ERRDIR
+eval ${MAKE} ${TARGET} /dev/null $ERRDIR
# And see if dummy exists and is executable, if so, then we
# assume the condition we are testing for is good
cvs commit: apache-1.3/src/support Makefile.tmpl apxs.pl
randy 98/12/01 16:00:20
Modified:.Makefile.tmpl configure
src CHANGES Configuration.tmpl Configure Makefile.tmpl
src/include httpd.h
src/main http_config.c http_log.c http_main.c util.c
src/modules/proxy proxy_cache.c
src/modules/standard mod_include.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
src/support Makefile.tmpl apxs.pl
Log:
Fix TARGET configuration when configuring and installing using
APACI configure. TARGET now defines the basename of the configuration
file, startup script, manual page, etc. log_error_core() now reports
the server binary name given by argv[0]. TARGET can now also be defined
with --target=TARGET parameter passed to APACI configure.
Reviewed by: Jim Jagielski, Randy Terbush, Ralf Engelschall
Revision ChangesPath
1.51 +41 -33apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile.tmpl 1998/11/13 11:25:01 1.50
+++ Makefile.tmpl 1998/12/01 23:59:51 1.51
@@ -88,6 +88,9 @@
INSTALL_DATA= $(INSTALL) -m 644
PERL= @PERL@
+# installation name of Apache webserver
+TARGET = @TARGET@
+
# installation root
# (overrideable by package maintainers for
# rolling packages without bristling the system)
@@ -201,12 +204,12 @@
echo | works correctly you now should first check the
|; \
echo | (initially created or preserved) configuration files
|; \
echo |
|; \
- echo | $(sysconfdir)/{httpd,access,srm}.conf; \
+ echo | $(sysconfdir)/{$(TARGET),access,srm}.conf; \
echo |
|; \
echo | and then you should be able to immediately fire up
|; \
echo | Apache the first time by running:
|; \
echo |
|; \
- echo | $(sbindir)/apachectl start; \
+ echo | $(sbindir)/$(TARGET)ctl start; \
echo |
|; \
echo | Thanks for using Apache. The Apache Group
|; \
echo |http://www.apache.org/
|; \
@@ -238,26 +241,26 @@
# install the server program and optionally corresponding
# shared object files.
install-programs:
- @echo === [programs: Installing Apache httpd program and shared
objects]
- $(INSTALL_PROGRAM) $(TOP)/$(SRC)/httpd $(root)$(sbindir)/httpd
+ @echo === [programs: Installing Apache $(TARGET) program and shared
objects]
+ $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET)
[EMAIL PROTECTED] [ .`grep 'SUBTARGET=target_shared'
$(TOP)/$(SRC)/Makefile` != . ]; then \
SHLIB_SUFFIX_NAME=`grep '^SHLIB_SUFFIX_NAME='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`; \
SHLIB_SUFFIX_LIST=`grep '^SHLIB_SUFFIX_LIST='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`; \
- echo $(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep; \
- $(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.ep
$(root)$(libexecdir)/libhttpd.ep; \
- echo $(INSTALL_DSO)
$(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}; \
- $(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}; \
+ echo $(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep; \
+ $(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep
$(root)$(libexecdir)/lib$(TARGET).ep; \
+ echo $(INSTALL_DSO)
$(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}; \
+ $(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}
$(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}; \
if [ .$${SHLIB_SUFFIX_LIST} != . ]; then \
- echo $(RM)
$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*; \
- $(RM) $(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*; \
+ echo $(RM)
$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}.*; \
+ $(RM)
$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}.*; \
for suffix in $${SHLIB_SUFFIX_LIST} ; do \
[ .$${suffix} = . ] continue
cvs commit: apache-1.3/src CHANGES
randy 98/12/01 22:12:12 Modified:.configure src CHANGES Added: .config.layout Log: There is no longer a _default_ path layout for APACI configure. This means the user _HAS_ to specifiy a path layout _explicitly_. Added a generic --with-layout=[FILE:]ID option. ID here is a layout identifier, currently Apache and GNU are pre-defined in the file config.layout. Custom layouts are possible by using FILE:ID as the argument where the layout ID is taken from FILE. The config.layout file consists of Layout ID../Layout sections where inside those sections path_variable: path_value pairs can be specified. These lines are converted to path_variable='path_value'. These are primarily Ralf's changes that I am commiting to allow me to begin working on another phase of these configure changes. Reviewed by: Randy Terbush, Ken Coar, Jim Jagielski Revision ChangesPath 1.52 +70 -53apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- configure 1998/12/01 23:59:52 1.51 +++ configure 1998/12/02 06:11:52 1.52 @@ -76,6 +76,8 @@ sedsubst=src/.apaci.sedsubst addconf=src/.apaci.addconf tplconf=src/.apaci.tplconf +pldconf=src/.apaci.pldconf +configlayout=config.layout configstatus=config.status ## @@ -170,19 +172,7 @@ fi # default paths -prefix='/usr/local/apache' -exec_prefix='$prefix' -bindir='$exec_prefix/bin' -sbindir='$exec_prefix/sbin' -libexecdir='$exec_prefix/libexec' -mandir='$prefix/man' -sysconfdir='$prefix/etc' -datadir='$prefix/share' -includedir='$prefix/include' -localstatedir='$prefix/var' -runtimedir='$localstatedir/run' -logfiledir='$localstatedir/log' -proxycachedir='$localstatedir/proxy' +prefix=UNSET # customization flags for # automatic apache suffix @@ -191,8 +181,9 @@ customized_localstatedir=0 customized_includedir=0 -# check and debug -layout=0 +# layout configuration +with_layout=0 +show_layout=0 # suexec defaults suexec=0 @@ -396,24 +387,26 @@ echo echo Stand-alone options: echo --help, -h print this message -echo --layout print installation layout (check and debug) +echo --show-layout print installation path layout (check and debug) +echo --layout backward compat use --show-layout echo echo Installation layout options: - echo --target=TARGETinstall server executable and associated files using basename TARGET +echo --with-layout=[F:]ID use installation path layout ID (from file F) +echo --target=TARGETinstall server executable and associated files using basename TARGET echo --prefix=PREFIXinstall architecture-independent files in PREFIX echo --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -echo --bindir=DIR install user executables in DIR [EPREFIX/bin] -echo --sbindir=DIR install sysadmin executables in DIR [EPREFIX/sbin] -echo --libexecdir=DIR install program executables in DIR [EPREFIX/libexec] -echo --mandir=DIR install manual pages in DIR [PREFIX/man] -echo --sysconfdir=DIR install configuration files in DIR [PREFIX/etc] -echo --datadir=DIR install read-only data files in DIR [PREFIX/share] -echo --includedir=DIR install includes files in DIR [PREFIX/include] -echo --localstatedir=DIRinstall modifiable data files in DIR [PREFIX/var] -echo --runtimedir=DIR install runtime data in DIR [PREFIX/var/run] -echo --logfiledir=DIR install logfile data in DIR [PREFIX/var/log] -echo --proxycachedir=DIRinstall proxy cache data in DIR [PREFIX/var/proxy] -echo --compat install with old Apache 1.2 installation paths +echo --bindir=DIR install user executables in DIR +echo --sbindir=DIR install sysadmin executables in DIR +echo --libexecdir=DIR install program executables in DIR +echo --mandir=DIR install manual pages in DIR +echo --sysconfdir=DIR install configuration files in DIR +echo --datadir=DIR install read-only data files in DIR +echo --includedir=DIR install includes files in DIR
cvs commit: apache-1.3/src/helpers TestCompile
randy 98/12/02 15:52:47 Modified:src/helpers TestCompile Log: Use environment variable for MAKE here. Still not clear if this is getting properly passed in. Revision ChangesPath 1.20 +1 -1 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TestCompile 1998/12/02 14:03:31 1.19 +++ TestCompile 1998/12/02 23:52:47 1.20 @@ -143,7 +143,7 @@ EOF # Now run that Makefile -eval make $TARGET /dev/null $ERRDIR +eval $MAKE $TARGET /dev/null $ERRDIR # And see if dummy exists and is executable, if so, then we # assume the condition we are testing for is good
cvs commit: apache-1.3/src CHANGES Configure
randy 98/11/11 10:36:10 Modified:src CHANGES Configure Log: Fallback to native compilers for IRIX-32 platform. It seems that a gcc 2.8.1 compiled apache is logging client addresses with all bits set (255.255.255.255). This is the second such problem caused by gcc 2.8.1 compiler. The first being broken semaphore locking. Revision ChangesPath 1.1145+6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1144 retrieving revision 1.1145 diff -u -r1.1144 -r1.1145 --- CHANGES 1998/11/10 07:30:06 1.1144 +++ CHANGES 1998/11/11 18:36:06 1.1145 @@ -1,5 +1,11 @@ Changes with Apache 1.3.4 + *) Fallback to native compilers for IRIX-32 platform. It seems that + a gcc 2.8.1 compiled apache is logging client addresses with all + bits set (255.255.255.255). This is the second such problem caused + by gcc 2.8.1 compiler. The first being broken semaphore locking. + [Randy Terbush] + *) Updated mime.types to reflect current Internet media types and include a URL to the registry. [Manoj Kasichainula, Roy Fielding] PR#2380, 2286, 2246 1.306 +1 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- Configure 1998/11/06 22:42:37 1.305 +++ Configure 1998/11/11 18:36:07 1.306 @@ -412,6 +412,7 @@ OS='SGI IRIX' fi fi + CC='cc' CFLAGS=$CFLAGS -DIRIX ;; *-sgi-irix)
cvs commit: apache-1.3/src/include ap_mmn.h http_config.h httpd.h
randy 98/08/12 18:33:56 Modified:src/include http_config.h httpd.h Added: src/include ap_mmn.h Log: Move MAGIC_MODULE_NUMBER history into ap_mmn.h. Submitted by: Randy Terbush [EMAIL PROTECTED] Reviewed by: Martin Kraemer, Jim Jagielski Revision ChangesPath 1.95 +16 -6 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- http_config.h 1998/08/11 09:26:22 1.94 +++ http_config.h 1998/08/13 01:33:55 1.95 @@ -190,6 +190,9 @@ * check that module is compatible with this * version of the server. */ +int minor_version; /* API minor version. Provides API feature + * milestones. Not checked during module init + */ int module_index;/* Index to this modules structures in * config vectors. */ @@ -269,14 +272,21 @@ } module; /* Initializer for the first few module slots, which are only - * really set up once we start running. Note that the first word - * is a version check; this should allow us to deal with changes to - * the API (the server can detect an old-format module, and either - * handle it back-compatibly, or at least signal an error). + * really set up once we start running. Note that the first two slots + * provide a version check; this should allow us to deal with changes to + * the API. The major number should reflect changes to the API handler table + * itself or removal of functionality. The minor number should reflect + * additions of functionality to the existing API. (the server can detect + * an old-format module, and either handle it back-compatibly, or at least + * signal an error). See src/include/ap_mmn.h for MMN version history. */ -#define MODULE_MAGIC_NUMBER 19980811 -#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL +#define STANDARD_MODULE_STUFFMODULE_MAGIC_NUMBER_MAJOR, \ + MODULE_MAGIC_NUMBER_MINOR, \ + -1, \ + __FILE__, \ + NULL, \ + NULL /* Generic accessors for other modules to get at their own module-specific * data 1.236 +1 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- httpd.h 1998/08/11 09:26:22 1.235 +++ httpd.h 1998/08/13 01:33:55 1.236 @@ -72,6 +72,7 @@ #include alloc.h #include buff.h #include ap.h +#include ap_mmn.h /* MODULE_MAGIC_NUMBER_ macros */ /* - config dir -- */ 1.1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === /* * Copyright (c) 1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software
cvs commit: apache-1.3/src/os/win32 ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.mak ApacheModuleDigest.mak ApacheModuleExpires.mak ApacheModuleHeaders.mak ApacheModuleInfo.mak ApacheModuleRewrite.mak ApacheModuleSpeling.mak ApacheModuleStatus.mak ApacheModuleUserTrack.mak Module.mak.tmpl
randy 98/08/12 18:55:26
Modified:src CHANGES
src/main http_config.c http_main.c
src/modules/standard mod_info.c mod_rewrite.c
src/os/win32 ApacheModuleAuthAnon.mak
ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
ApacheModuleExpires.mak ApacheModuleHeaders.mak
ApacheModuleInfo.mak ApacheModuleRewrite.mak
ApacheModuleSpeling.mak ApacheModuleStatus.mak
ApacheModuleUserTrack.mak Module.mak.tmpl
Log:
Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should
provide a way to trace API changes that add functionality but do
not create a compatibility issue for precompiled modules, etc.
Submitted by: Randy Terbush [EMAIL PROTECTED]
Reviewed by: Martin Kraemer, Jim Jagielski
Revision ChangesPath
1.1023+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -r1.1022 -r1.1023
--- CHANGES 1998/08/12 11:33:35 1.1022
+++ CHANGES 1998/08/13 01:54:59 1.1023
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) Split MODULE_MAGIC_NUMBER into _MAJOR/_MINOR numbers. This should
+ provide a way to trace API changes that add functionality but do
+ not create a compatibility issue for precompiled modules, etc.
+ [Randy Terbush]
+
*) Fix suexec installation under `make install root=xxx' situation.
[Ralf S. Engelschall]
1.125 +2 -7 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- http_config.c 1998/08/11 15:47:59 1.124
+++ http_config.c 1998/08/13 01:55:06 1.125
@@ -538,15 +538,10 @@
* teased out...
*/
-/* At some point, we may want to offer back-compatibility for
- * loading modules that are for older versions of Apache. For now,
- * though, we don't.
- */
-
-if (m-version != MODULE_MAGIC_NUMBER) {
+if (m-version != MODULE_MAGIC_NUMBER_MAJOR) {
fprintf(stderr, httpd: module \%s\ is not compatible with this
version of Apache.\n, m-name);
- fprintf(stderr, Please contact the author for the correct version.\n);
+ fprintf(stderr, Please contact the vendor for the correct version.\n);
exit(1);
}
1.387 +2 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- http_main.c 1998/08/12 19:22:18 1.386
+++ http_main.c 1998/08/13 01:55:06 1.387
@@ -3224,7 +3224,8 @@
{
printf(Server version: %s\n, ap_get_server_version());
printf(Server built: %s\n, ap_get_server_built());
-printf(Server's Module Magic Number: %u\n, MODULE_MAGIC_NUMBER);
+printf(Server's Module Magic Number: %u:%u\n,
+MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
printf(Server compiled with\n);
#ifdef BIG_SECURITY_HOLE
printf( -D BIG_SECURITY_HOLE\n);
1.42 +2 -2 apache-1.3/src/modules/standard/mod_info.c
Index: mod_info.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_info.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mod_info.c1998/08/06 17:30:59 1.41
+++ mod_info.c1998/08/13 01:55:14 1.42
@@ -406,8 +406,8 @@
font size=+1tt%s/tt/a/fontbr\n,
ap_get_server_built());
ap_rprintf(r, strongAPI Version:/strong
-tt%d/ttbr\n,
-MODULE_MAGIC_NUMBER);
+tt%d:%d/ttbr\n,
+MODULE_MAGIC_NUMBER_MAJOR:MODULE_MAGIC_NUMBER_MINOR);
ap_rprintf(r, strongRun Mode:/strong tt%s/ttbr\n,
(ap_standalone ? standalone : inetd));
ap_rprintf(r, strongUser/Group:/strong
1.129 +2 -1 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mod_rewrite.c 1998
cvs commit: apache-1.3/src/modules/standard mod_info.c
randy 98/08/12 19:51:41 Modified:src/include ap_mmn.h Log: Preserve backward compatibility. Pointed out by Roy and Rasmus. Revision ChangesPath 1.2 +1 -0 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ap_mmn.h 1998/08/13 01:33:55 1.1 +++ ap_mmn.h 1998/08/13 02:51:27 1.2 @@ -166,5 +166,6 @@ #define MODULE_MAGIC_NUMBER_MAJOR 19980812 #endif #define MODULE_MAGIC_NUMBER_MINOR 0001 +#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ #endif /* !APACHE_AP_MMN_H */ Modified:src/modules/standard mod_info.c Log: Fix thinko. Revision ChangesPath 1.43 +1 -1 apache-1.3/src/modules/standard/mod_info.c Index: mod_info.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_info.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mod_info.c1998/08/13 01:55:14 1.42 +++ mod_info.c1998/08/13 02:51:38 1.43 @@ -407,7 +407,7 @@ ap_get_server_built()); ap_rprintf(r, strongAPI Version:/strong tt%d:%d/ttbr\n, -MODULE_MAGIC_NUMBER_MAJOR:MODULE_MAGIC_NUMBER_MINOR); +MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR); ap_rprintf(r, strongRun Mode:/strong tt%s/ttbr\n, (ap_standalone ? standalone : inetd)); ap_rprintf(r, strongUser/Group:/strong
cvs commit: apache-1.3/src/include ap_config.h httpd.h
randy 98/08/12 19:59:34 Modified:src/include ap_config.h httpd.h Log: Try to preserve backward compatibility. Revision ChangesPath 1.231 +2 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- ap_config.h 1998/08/03 09:14:47 1.230 +++ ap_config.h 1998/08/13 02:59:32 1.231 @@ -67,6 +67,8 @@ * See PORTING for a listing of what they mean */ +#include ap_mmn.h /* MODULE_MAGIC_NUMBER_ */ + /* * Support for platform dependent autogenerated defines */ 1.237 +0 -1 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- httpd.h 1998/08/13 01:33:55 1.236 +++ httpd.h 1998/08/13 02:59:33 1.237 @@ -72,7 +72,6 @@ #include alloc.h #include buff.h #include ap.h -#include ap_mmn.h /* MODULE_MAGIC_NUMBER_ macros */ /* - config dir -- */
cvs commit: apache-1.3/src/support Makefile.tmpl
randy 98/05/29 11:21:17
Modified:src ApacheCore.dsp ApacheCore.mak CHANGES
src/include util_md5.h
src/main Makefile.tmpl md5c.c
src/modules/proxy ApacheModuleProxy.mak Makefile.tmpl
proxy_cache.c proxy_util.c
src/os/win32 ApacheModuleDigest.mak
src/os/win32/installer apache.iwz
src/support Makefile.tmpl
Added: src/include ap_md5.h
Removed: src/include md5.h
Log:
Rename md5.h - ap_md5.h to avoid local conflicts.
Submitted by: Randy Terbush [EMAIL PROTECTED]
Reviewed by: Brian Behlendorf, Dirk-Willem van Gulik
Revision ChangesPath
1.27 +1 -1 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ApacheCore.dsp1998/04/09 08:20:18 1.26
+++ ApacheCore.dsp1998/05/29 18:20:34 1.27
@@ -342,7 +342,7 @@
# End Source File
# Begin Source File
-SOURCE=.\include\md5.h
+SOURCE=.\include\ap_md5.h
# End Source File
# Begin Source File
1.37 +6 -6 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ApacheCore.mak1998/04/09 08:20:18 1.36
+++ ApacheCore.mak1998/05/29 18:20:34 1.37
@@ -707,7 +707,7 @@
.\include\http_request.h\
.\include\http_vhost.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\rfc1413.h\
.\include\scoreboard.h\
.\include\util_md5.h\
@@ -745,7 +745,7 @@
.\include\http_request.h\
.\include\http_vhost.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\rfc1413.h\
.\include\scoreboard.h\
.\include\util_md5.h\
@@ -1090,7 +1090,7 @@
DEP_CPP_MD5C_=\
.\include\conf.h\
.\include\hsregex.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\os\win32\os.h\
{$(INCLUDE)}sys\stat.h\
{$(INCLUDE)}sys\types.h\
@@ -1108,7 +1108,7 @@
DEP_CPP_MD5C_=\
.\include\conf.h\
.\include\hsregex.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\os\win32\os.h\
@@ -2515,7 +2515,7 @@
.\include\conf.h\
.\include\hsregex.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\util_md5.h\
.\include\util_uri.h\
.\os\win32\os.h\
@@ -2542,7 +2542,7 @@
.\include\conf.h\
.\include\hsregex.h\
.\include\httpd.h\
- .\include\md5.h\
+ .\include\ap_md5.h\
.\include\util_md5.h\
.\include\util_uri.h\
.\os\win32\os.h\
1.877 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- CHANGES 1998/05/29 08:32:36 1.876
+++ CHANGES 1998/05/29 18:20:34 1.877
@@ -1,5 +1,8 @@
Changes with Apache 1.3b8
+ *) Rename md5.h to ap_md5.h to avoid conflicts with native MD5 on
+ some systems. [Randy Terbush]
+
*) Change usage of perror()+fprintf(stderr,...) in mod_rewrite to
more proper ap_log_error() variants.
[Ralf S. Engelschall]
1.15 +1 -1 apache-1.3/src/include/util_md5.h
Index: util_md5.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/util_md5.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- util_md5.h1998/05/03 17:31:11 1.14
+++ util_md5.h1998/05/29 18:20:49 1.15
@@ -62,7 +62,7 @@
extern C {
#endif
-#include md5.h
+#include ap_md5.h
API_EXPORT(char *) ap_md5(pool *a, unsigned char *string);
API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
1.1 apache-1.3/src/include/ap_md5.h
Index: ap_md5.h
===
/*
* This is work is derived from material Copyright RSA Data Security, Inc.
*
* The RSA copyright statement and Licence for that original material is
* included below. This is followed by the Apache copyright statement and
* licence for the modifications made to that material.
*/
/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
rights reserved.
License to copy
cvs commit: apache-1.3 STATUS
randy 98/03/29 18:16:19 Modified:.STATUS Log: More votes. Revision ChangesPath 1.239 +6 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- STATUS1998/03/30 01:52:47 1.238 +++ STATUS1998/03/30 02:16:18 1.239 @@ -15,7 +15,7 @@ or not, and if not, what changes are needed to make it right. Approve guidelines as written: - +1: Roy, Dean, Paul, Jim, Martin, Ralf + +1: Roy, Dean, Paul, Jim, Martin, Ralf, Randy +0: -1: @@ -181,12 +181,16 @@ apint_xxx: +1: Ralf (int = internal) Alternate proposal: - Everything should be ap_: +1 Dean + Everything should be ap_: +1 Dean, Randy Why? Because it's far easier to type, and damn it, I type these things far too much. Just using apapi_ for the few hours I did while writing apapi_vformatter is making me puke. So many extra characters, so much wasted screen width, and keystrokes. -Dean + +I agree with Dean 100%. The work created to keep this straight +far outweighs any gain this could give. -Randy + -1: Jim. We should make some sort of logical effort to keep things straight and organized. Taken to it's logical conclusion, this argument could be used to keep all variable
cvs commit: apache-1.3 STATUS
randy 98/03/27 06:22:37 Modified:.STATUS Log: The first thunderstorm of the year right now... Revision ChangesPath 1.224 +16 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- STATUS1998/03/27 08:09:00 1.223 +++ STATUS1998/03/27 14:22:36 1.224 @@ -269,13 +269,20 @@ worth adding it by weighting on the advantages and disadvantages. Votes for including APACI (in general): - Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1, Jim +1, Chuck +0 + Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1, Jim +1, Chuck +0, + Randy +0 Votes for commit variants: - CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 Jim +1, Chuck +0 + CV1: Ralf +1, Dean +1, Roy +1, Paul +1, Martin +1 Jim +1, Chuck +0, + Randy +0 CV2: Ralf +0 Notes: + Randy: Given the amount of work that Ralf has clearly done on this, + I would not veto it. However, I don't think this is something + that should go in for 1.3.0 general and I don't feel that the + current system is lacking enough that it needs replacing. + We're asking for trouble. Chuck: What the heck. We're not releasing soon anymore. Let users get used to it if there's time. Jim: [the +1] iff we remove the present top-level build @@ -428,8 +435,14 @@ Proposal: the next release should be named 1.3b6, and labelled release candidate on unix, beta on NT. The release after that will be called 1.3.0 stable on unix, beta on NT. - +1: Jim, Ralf + +1: Jim, Ralf, Randy +0: Dean + +Notes: +Randy: APACI should go in a beta release if it is to go in at all. + I would also argue that 1.3b6 is _not_ stable. I've been + having real fits keeping it alive on a dual processor + machine. Could be OS problems.. Win32 specific issues:
cvs commit: apache-site/info supportdb.txt
randy 98/03/26 05:50:08 Modified:info supportdb.txt Log: Correct a typo. Revision ChangesPath 1.9 +1 -1 apache-site/info/supportdb.txt Index: supportdb.txt === RCS file: /export/home/cvs/apache-site/info/supportdb.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- supportdb.txt 1998/03/12 08:46:24 1.8 +++ supportdb.txt 1998/03/26 13:50:07 1.9 @@ -1,5 +1,5 @@ # Type NameURL E-mail Phone Fax LocationComments -Comp Covalent Technologies http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA +Comp Covalent Technologies, Inc. http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Covalentdevelops and sells Raven, an SSL add-on module for Apache. Comp Dana Point Communication Systemshttp://www.dpcsys.com/ [EMAIL PROTECTED] (714) 443-4172 (714) 443-9516 Dana Point, California Comp Digituruhttp://www.digit.ee/[EMAIL PROTECTED] Estonia Comp ICONSULThttp://www.iconsult.com/[EMAIL PROTECTED] +49-(0)9131-502864 +49-(0)9131-537873 Erlangen, Germany
cvs commit: apache-site/info support.cgi
randy 98/03/26 05:53:56 Modified:info support.cgi Log: Add background to look more consistant with the rest of the site. Revision ChangesPath 1.2 +3 -1 apache-site/info/support.cgi Index: support.cgi === RCS file: /export/home/cvs/apache-site/info/support.cgi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- support.cgi 1997/03/25 04:43:17 1.1 +++ support.cgi 1998/03/26 13:53:55 1.2 @@ -9,7 +9,9 @@ \r HTMLHEAD TITLECompanies and Contractors Providing Commercial Support for Apache/TITLE -/HEADBODY +/HEAD +BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 + ALINK=#FF H1Companies and Contractors Providing Commercial Support for Apache/H1
cvs commit: apache-site/info supportdb.txt
randy 98/03/26 05:55:37 Modified:info supportdb.txt Log: ... Revision ChangesPath 1.10 +1 -1 apache-site/info/supportdb.txt Index: supportdb.txt === RCS file: /export/home/cvs/apache-site/info/supportdb.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- supportdb.txt 1998/03/26 13:50:07 1.9 +++ supportdb.txt 1998/03/26 13:55:36 1.10 @@ -1,5 +1,5 @@ # Type NameURL E-mail Phone Fax LocationComments -Comp Covalent Technologies, Inc. http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Covalentdevelops and sells Raven, an SSL add-on module for Apache. +Comp Covalent Technologies, Inc. http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Covalent develops and sells Raven, an SSL add-on module for Apache. Comp Dana Point Communication Systemshttp://www.dpcsys.com/ [EMAIL PROTECTED] (714) 443-4172 (714) 443-9516 Dana Point, California Comp Digituruhttp://www.digit.ee/[EMAIL PROTECTED] Estonia Comp ICONSULThttp://www.iconsult.com/[EMAIL PROTECTED] +49-(0)9131-502864 +49-(0)9131-537873 Erlangen, Germany
cvs commit: apache-site related_projects.html
randy 98/03/10 12:54:29 Modified:.related_projects.html Log: Missed a bit. Revision ChangesPath 1.23 +1 -0 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- related_projects.html 1998/03/10 20:47:43 1.22 +++ related_projects.html 1998/03/10 20:54:28 1.23 @@ -37,6 +37,7 @@ UL LIA HREF=#apacheweekApache Week/A (free weekly newsletter) +LIA HREF=#ravenCovalent Raven/A LIA HREF=#matriceMatrice W3/A LIA HREF=#strongholdStronghold/A LIA HREF=#tenonWebTen, a MacOS port of Apache/A
cvs commit: apache-1.3 Announcement
randy 98/02/19 14:49:43 Modified:.Announcement Log: Catch a couple of typos before the announcment. Revision ChangesPath 1.9 +2 -2 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Announcement 1998/02/14 00:58:52 1.8 +++ Announcement 1998/02/19 22:49:42 1.9 @@ -1,4 +1,4 @@ -Apache 1.3beta4 Released +Apache 1.3beta5 Released The Apache Group is pleased to announce the release of the 1.3b5 version @@ -26,7 +26,7 @@ of 1996. The September 1997 WWW server site survey by Netcraft (see: http://www.netcraft.co.uk/Survey/) found that more web servers were using Apache than any other software. Apache and its derivatives are run -on over 49% of all web domains on the Internet. +on over 50% of all web domains on the Internet. The Apache project has been organized in an attempt to answer some of the concerns regarding active development of a public domain HTTP server
cvs commit: apache-1.3/src/main buff.c
randy 98/02/02 18:41:22
Modified:src/ap Makefile.tmpl
src/include ap.h
src/main buff.c
Added: src/ap ap_read.c ap_write.c
Log:
Abstract read() and write() to the ap library to make it easier
to add in different types of read/write libraries in a central
location. This mainly keeps buff.c less messy with #ifdefs.
Revision ChangesPath
1.10 +4 -1 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1998/02/01 15:56:21 1.9
+++ Makefile.tmpl 1998/02/03 02:41:19 1.10
@@ -6,7 +6,8 @@
LIB=libap.a
-OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o
ap_execve.o
+OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o \
+ ap_execve.o ap_read.o ap_write.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
@@ -30,3 +31,5 @@
ap_strings.o: $(INCDIR)/httpd.h
ap_cpystrn.o: $(INCDIR)/httpd.h
ap_execve.o: $(INCDIR)/httpd.h $(INCDIR)/http_log.h
+ap_read.o: $(INCDIR)/httpd.h
+ap_write.o: $(INCDIR)/httpd.h
1.1 apache-1.3/src/ap/ap_read.c
Index: ap_read.c
===
/*
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* 4. The names Apache Server and Apache Group must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Redistributions of any form whatsoever must retain the following
*acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group and was originally based
* on public domain software written at the National Center for
* Supercomputing Applications, University of Illinois, Urbana-Champaign.
* For more information on the Apache Group and the Apache HTTP server
* project, please see http://www.apache.org/.
*
*/
#include httpd.h
/* the lowest level reading primitive */
API_EXPORT(int) ap_read(BUFF *fb, void *buf, int nbyte)
{
int rv;
rv = read(fb-fd_in, buf, nbyte);
return rv;
}
1.1 apache-1.3/src/ap/ap_write.c
Index: ap_write.c
===
/*
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
cvs commit: apache-1.3/src CHANGES
randy 98/02/02 18:45:45 Modified:src CHANGES Log: Update CHANGES Revision ChangesPath 1.613 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.612 retrieving revision 1.613 diff -u -r1.612 -r1.613 --- CHANGES 1998/02/01 22:05:31 1.612 +++ CHANGES 1998/02/03 02:45:43 1.613 @@ -1,5 +1,12 @@ Changes with Apache 1.3b4 + *) Abstract read()/write() out of buff.c to the libap library. + Makes it easier to add other types of IO code such as SFIO. + [Randy Terbush] + + *) Generalize default_port manipulations to make support of + different protocols easier. [Ben Laurie, Randy Terbush] + *) There are many cases where users do not want Apache to form self-referential urls using the canonical ServerName and Port. The new UseCanonicalName directive (default on), if set to off
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
randy 98/02/02 14:33:41
Modified:src/include httpd.h
src/main http_config.c http_core.c http_protocol.c util.c
src/modules/proxy mod_proxy.c proxy_http.c
src/modules/standard mod_rewrite.c
Log:
Generalize default_port manipulations.
The proxy may still need some work, but will defer until I can
review these changes with others.
Obtained from: Ben Laurie, Randy Terbush
Reviewed by: Ben Laurie, Randy Terbush
Revision ChangesPath
1.180 +6 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- httpd.h 1998/02/01 22:05:34 1.179
+++ httpd.h 1998/02/02 22:33:29 1.180
@@ -116,7 +116,11 @@
/* -- Port number for server running standalone ---
*/
-#define DEFAULT_PORT 80
+#define DEFAULT_HTTP_PORT80
+#define DEFAULT_HTTPS_PORT 443
+#define is_default_port(port,r) ((port) == default_port(r))
+#define http_method(r) http
+#define default_port(r) DEFAULT_HTTP_PORT
/* - Default user name and group name running standalone --
*/
/* --- These may be specified as numbers by placing a # before a number ---
*/
@@ -802,7 +806,7 @@
#define escape_uri(ppool,path) os_escape_path(ppool,path,1)
API_EXPORT(char *) escape_html(pool *p, const char *s);
API_EXPORT(char *) construct_server(pool *p, const char *hostname,
- unsigned port);
+ unsigned port, const request_rec *r);
API_EXPORT(char *) escape_shell_cmd(pool *p, const char *s);
API_EXPORT(int) count_dirs(const char *path);
1.95 +1 -1 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- http_config.c 1998/01/21 22:11:01 1.94
+++ http_config.c 1998/02/02 22:33:31 1.95
@@ -1225,7 +1225,7 @@
{
server_rec *s = (server_rec *) pcalloc(p, sizeof(server_rec));
-s-port = DEFAULT_PORT;
+s-port = 0;
s-server_admin = DEFAULT_ADMIN;
s-server_hostname = NULL;
s-error_fname = DEFAULT_ERRORLOG;
1.156 +3 -3 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- http_core.c 1998/02/02 19:46:53 1.155
+++ http_core.c 1998/02/02 22:33:32 1.156
@@ -622,11 +622,11 @@
: r-server-port;
host = r-hostname ? r-hostname : r-server-server_hostname;
}
-if (port == DEFAULT_PORT) {
- return pstrcat(p, http://;, host, uri, NULL);
+if (is_default_port(port, r)) {
+ return pstrcat(p, http_method(r), ://, host, uri, NULL);
}
ap_snprintf(portnum, sizeof(portnum), %u, port);
-return pstrcat(p, http://;, host, :, portnum, uri, NULL);
+return pstrcat(p, http_method(r), ://, host, :, portnum, uri, NULL);
}
/*
1.184 +9 -6 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- http_protocol.c 1998/01/31 00:15:43 1.183
+++ http_protocol.c 1998/02/02 22:33:33 1.184
@@ -625,14 +625,17 @@
const char *check_fulluri(request_rec *r, const char *uri)
{
-char *name, *host;
-int i;
+char *name, *host, *proto;
+int i, plen;
unsigned port;
/* This routine parses full URLs, if they match the server */
-if (strncasecmp(uri, http://;, 7))
+proto = http_method(r);
+plen = strlen(proto);
+
+if (strncasecmp(uri, proto, plen) || strncasecmp(uri + plen, ://, 3))
return uri;
-name = pstrdup(r-pool, uri + 7);
+name = pstrdup(r-pool, uri + plen);
/* Find the hostname, assuming a valid request */
i = ind(name, '/');
@@ -643,7 +646,7 @@
if (*name)
port = atoi(name);
else
-port = 80;
+port = default_port(r);
/* Make sure ports patch */
if (port != r-server-port)
@@ -651,7 +654,7 @@
/* Save it for later use */
r-hostname = pstrdup(r-pool, host
cvs commit: apache/src httpd.h
randy 98/01/06 14:24:26 Modified:src Tag: APACHE_1_2_X httpd.h Log: Move back to development version. Revision ChangesPath No revision No revision 1.111.2.19 +1 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.111.2.18 retrieving revision 1.111.2.19 diff -u -r1.111.2.18 -r1.111.2.19 --- httpd.h 1998/01/05 23:20:09 1.111.2.18 +++ httpd.h 1998/01/06 22:24:25 1.111.2.19 @@ -256,7 +256,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.2.5 /* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.2.6-dev /* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION SERVER_SUBVERSION #else
cvs commit: apache/src httpd.h
randy 98/01/05 15:20:10 Modified:src Tag: APACHE_1_2_X httpd.h Log: Prepare for 1.2.5 release. Revision ChangesPath No revision No revision 1.111.2.18 +1 -1 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.111.2.17 retrieving revision 1.111.2.18 diff -u -r1.111.2.17 -r1.111.2.18 --- httpd.h 1997/08/22 08:04:27 1.111.2.17 +++ httpd.h 1998/01/05 23:20:09 1.111.2.18 @@ -256,7 +256,7 @@ * Example: Apache/1.1.0 MrWidget/0.1-alpha */ -#define SERVER_BASEVERSION Apache/1.2.5-dev /* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION Apache/1.2.5 /* SEE COMMENTS ABOVE */ #ifdef SERVER_SUBVERSION #define SERVER_VERSION SERVER_BASEVERSION SERVER_SUBVERSION #else
cvs commit: apache-site/mirrors index.html mirrors.list
randy 97/11/03 16:56:19 Modified:mirrors index.html mirrors.list Log: Update the mirrors page. Yes, I am still alive... Revision ChangesPath 1.18 +33 -3 apache-site/mirrors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- index.html1997/10/27 00:02:31 1.17 +++ index.html1997/11/04 00:56:18 1.18 @@ -31,8 +31,10 @@ !-- [EMAIL PROTECTED] -- A HREF=http://www.syd.dit.csiro.au/tools/apache/;au/A - !-- [EMAIL PROTECTED] -- -A HREF=http://boomer.digibel.be/mirrors/apache/;be/A - -!-- [EMAIL PROTECTED] -- +A HREF=http://apache.belnet.be/;be/A - +!-- [EMAIL PROTECTED] -- +A HREF=http://apache.digibel.be/;be/A - +!-- [EMAIL PROTECTED] -- A HREF=http://apache.nat.bg/;bg/A - !-- [EMAIL PROTECTED] -- A HREF=http://br.apache.org/;br/A - @@ -41,8 +43,12 @@ !-- [EMAIL PROTECTED] -- A HREF=http://apache.abordo.com.br/;br/A - !-- [EMAIL PROTECTED] -- +A HREF=http://micromou.point-net.com/mirror/apache/;ca/A - +!-- [EMAIL PROTECTED] -- A HREF=http://sunsite.cnlab-switch.ch/www/mirror/apache/;ch/A - !-- [EMAIL PROTECTED] -- +A HREF=http://apache.interred.net.co/;co/A - +!-- [EMAIL PROTECTED] -- A HREF=http://apache.ucr.ac.cr/;cr/A - !-- [EMAIL PROTECTED] -- A HREF=http://sunsite.mff.cuni.cz/web/apache/;cz/A - @@ -55,12 +61,16 @@ !-- [EMAIL PROTECTED] -- A HREF=http://apache.rz.fh-hannover.de/;de/A - !-- [EMAIL PROTECTED] -- +A HREF=http://www.milliways.ask.fh-furtwangen.de/apache/;de/A - +!-- [EMAIL PROTECTED] -- A HREF=http://sunsite.auc.dk/apache/;dk/A - !-- [EMAIL PROTECTED] -- A HREF=http://zone.pspt.fi/apache/;fi/A - !-- [EMAIL PROTECTED] -- A HREF=http://www.pal.xgw.fi/apache/;fi/A - !-- [EMAIL PROTECTED] -- +A HREF=http://www.zoo-gate.fi/mirrors/apache/;fi/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.ut.ee/apache/;ee/A - !-- [EMAIL PROTECTED] -- A HREF=http://www.develnet.es/apache/;es/A - @@ -71,6 +81,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://slug.ctv.es/mirror/apache_httpd/;es/A - !-- [EMAIL PROTECTED] -- +A HREF=http://www.arrakis.es/pub/apache/;es/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.cge-ol.fr/apache/;fr/A - !-- [EMAIL PROTECTED] -- A HREF=http://www.teaser.fr/apache/;fr/A - @@ -123,6 +135,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://www.cyberweb.com.my/apache/;my/A - !-- [EMAIL PROTECTED] -- +A HREF=http://itc.kusza.edu.my/apache/;my/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.mbh.org/archive/apache/;nl/A - !-- [EMAIL PROTECTED] -- A HREF=http://www.ipe.nl/apache/;nl/A - @@ -135,6 +149,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://xenium.pdi.lodz.pl/Apache/;pl/A - !-- [EMAIL PROTECTED] -- +A HREF=http://www.task.gda.pl/pub/www/apache/;pl/A - +!-- [EMAIL PROTECTED] -- A HREF=http://ftp.ua.pt/pub/infosystems/www/apache/;pt/A - !-- [EMAIL PROTECTED] -- A HREF=http://ftp.dei.uc.pt/apache/;pt/A - @@ -146,7 +162,7 @@ A HREF=http://www.module.vympel.msk.ru/mirror/apache/;ru/A - !-- [EMAIL PROTECTED] -- A HREF=http://apache.ifmo.ru/;ru/A - -!-- [EMAIL PROTECTED] -- +!-- [EMAIL PROTECTED] -- A HREF=http://www.tomcat.ru/apache/;ru/A - !-- [EMAIL PROTECTED] -- A HREF=http://apache.inf.ru/;ru/A - @@ -161,6 +177,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://sunsite.uakom.sk/apache/;sk/A - !-- [EMAIL PROTECTED] -- +A HREF=http://www.alla.sk/apache/;sk/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.sai.msu.su/apache/;su/A - !-- oleg@sai.msu.su -- A HREF=http://www-dc.riubon.ac.th/pub/apache/;th/A - @@ -179,6 +197,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://sunsite.doc.ic.ac.uk/packages/apache/;ac.uk/A - !-- [EMAIL PROTECTED] -- +A HREF=http://www.hensa.ac.uk/mirrors/apache/;ac.uk/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.ukweb.com/apache/;co.uk/A - !-- [EMAIL PROTECTED] -- A HREF=http://www2.idiscover.co.uk/apache/;co.uk/A - @@ -228,6 +248,10 @@ !-- -- A HREF=ftp://Bond.edu.au/pub/apache/dist/;au/A - !-- -- +A HREF=ftp://ftp.belnet.be/packages/apache/;be/A - +!-- -- +A HREF=ftp://ftp.ntrl.net/pub/mirror/apache/;bg/A - +!-- -- A HREF=ftp://ftp.gns.com.br/pub/unix/apache/dist/;br/A - !-- -- A HREF=ftp://ftp.abordo.com.br/pub/apache/;br/A - @@ -264,6 +288,8 @@ !-- -- A HREF=ftp://slug.ctv.es/mirror/apache_httpd/;es/A - !-- -- +A HREF=ftp://ftp.arrakis.es/pub/apache/;es/A - +!-- -- A HREF=ftp://ftp.pspt.fi/pub/unix/www/apache/;fi
cvs commit: apache-site/contributors index.html
randy 97/11/03 17:19:44 Modified:contributors index.html Log: Update changes. Revision ChangesPath 1.20 +5 -6 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- index.html1997/11/03 18:41:41 1.19 +++ index.html1997/11/04 01:19:43 1.20 @@ -423,14 +423,13 @@ P BName:/B A NAME=terbushRandy Terbush/ABR -BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR -BURL:/B A HREF=http://www.zyzzyva.com/;http://www.zyzzyva.com//ABR -BOrganization:/B Zyzzyva EnterprisesBR -BOccupation:/B Internet Services, Sysadmin, WebmasterBR +BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR +BURL:/B A HREF=http://www.covalent.net/;http://www.covalent.net//ABR +BOrganization:/B Covalent TechnologiesBR +BOccupation:/B Network AdministrationBR BLocation:/B Lincoln, NE, USABR BComments:/B BR -BOS Expertise:/B NetBSD, BSDI, SunOS 4.1.x, HPUXBR -BContributions:/B Logo Design; NetBSD, BSDI SunOS porting.BR +BOS Expertise:/B *BSDBR P
cvs commit: apache-site ABOUT_APACHE.html
randy 97/11/03 17:22:16 Modified:.ABOUT_APACHE.html Log: Update changes. Revision ChangesPath 1.8 +3 -3 apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ABOUT_APACHE.html 1997/11/03 18:41:40 1.7 +++ ABOUT_APACHE.html 1997/11/04 01:22:15 1.8 @@ -240,7 +240,7 @@ TR TDRandy Terbushnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD - TDZyzzyva ISP, Nebraska + TDCovalent Technologies, Nebraska /TD /TR TR @@ -307,8 +307,8 @@ Many 3SUPrd/SUP-party modules, frequently used and recommended, are also freely-available and linked from the related projects page: lt;A - HREF=http://www.zyzzyva.com/module_registry/; - SAMPhttp://www.zyzzyva.com/module_registry//SAMP/Agt;, and + HREF=http://www.covalent.net/module_registry/; + SAMPhttp://www.covalent.net/module_registry//SAMP/Agt;, and their authors frequently contribute ideas, patches, and testing. In particular, Doug MacEachern (SAMPmod_perl/SAMP) and Rasmus Lerdorf (SAMPmod_php/SAMP).
cvs commit: apache-site related_projects.html
randy 97/11/03 17:23:34 Modified:.related_projects.html Log: Update changes. Revision ChangesPath 1.10 +3 -3 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- related_projects.html 1997/08/03 10:11:06 1.9 +++ related_projects.html 1997/11/04 01:23:33 1.10 @@ -79,7 +79,7 @@ BLOCKQUOTE For more information about the Apache Module Registry, please consult the page at -A HREF=http://www.zyzzyva.com/server/module_registry/;Zyzzyva Enterprises/A (Nebraska). +A HREF=http://www.covalent.net/module_registry/;Covalent Technologies/A (Nebraska). /BLOCKQUOTE hr @@ -103,12 +103,12 @@ PHP/FI implements a simple HTML-embedded scripting language. It includes a built-in page logging/counting mechanism with the ability to log hits to an SQL database. It also supports a number of RDBMS packages including -mSQL 1, mSQL 2, MySQL, FilePro, Solid, Postgres95, PostgreSQL, Oracle, and +Adabas-D, mSQL 1, mSQL 2, MySQL, FilePro, Solid, Postgres95, PostgreSQL, Oracle, and Sybase. BLOCKQUOTE For more information on PHP/FI see the -A HREF=http://www.vex.net/php/;PHP/FI Homepage/A (Toronto). +A HREF=http://php.iquest.net/;PHP/FI Homepage/A. /BLOCKQUOTE HR
cvs commit: apache-site/info supportdb.txt
randy 97/11/03 17:30:00 Modified:info supportdb.txt Log: Update changes. Revision ChangesPath 1.2 +1 -1 apache-site/info/supportdb.txt Index: supportdb.txt === RCS file: /export/home/cvs/apache-site/info/supportdb.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- supportdb.txt 1997/03/25 04:43:17 1.1 +++ supportdb.txt 1997/11/04 01:30:00 1.2 @@ -1,8 +1,8 @@ # Type NameURL E-mail Phone Fax LocationComments +Comp Covalent Technologies http://www.covalent.net/[EMAIL PROTECTED] (402) 441-5710 (402) 441-5720 Lincoln, Nebraska, USA Comp Dana Point Communication Systemshttp://www.dpcsys.com/ [EMAIL PROTECTED] (714) 443-4172 (714) 443-9516 Dana Point, California Comp Digituruhttp://www.digit.ee/[EMAIL PROTECTED] Estonia Comp ICONSULThttp://www.iconsult.com/[EMAIL PROTECTED] +49-(0)9131-502864 +49-(0)9131-537873 Erlangen, Germany -Comp Zyzzyva Enterprises http://www.zyzzyva.com/ [EMAIL PROTECTED] (402) 438-1848 (402) 438-1869 Lincoln, Nebraska Cont Russell McOrmondhttp://www.flora.ottawa.on.ca/russell/work/ [EMAIL PROTECTED] (613) 235-7584 (613) 235-9627 Ottawa, Canada Comp Spacestar Communicationshttp://www.spacestar.com/ [EMAIL PROTECTED] (612) 896-1100 (612) 896-1750 Minneapolis, Minnesota Comp Trytel Internet Inc.http://www.trytel.com/ [EMAIL PROTECTED] (613) 722-6321 (613) 722-6749 Ottawa, Canada
cvs commit: apache-site/mirrors index.html mirrors.list
randy 97/11/04 09:41:42 Modified:mirrors index.html mirrors.list Log: Correct an address. Revision ChangesPath 1.19 +2 -2 apache-site/mirrors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- index.html1997/11/04 00:56:18 1.18 +++ index.html1997/11/04 17:41:41 1.19 @@ -162,9 +162,9 @@ A HREF=http://www.module.vympel.msk.ru/mirror/apache/;ru/A - !-- [EMAIL PROTECTED] -- A HREF=http://apache.ifmo.ru/;ru/A - -!-- [EMAIL PROTECTED] -- +!-- -- A HREF=http://www.tomcat.ru/apache/;ru/A - -!-- [EMAIL PROTECTED] -- +!-- [EMAIL PROTECTED] -- A HREF=http://apache.inf.ru/;ru/A - !-- [EMAIL PROTECTED] -- A HREF=http://www.unit.liu.se/apache/;se/A - 1.32 +2 -2 apache-site/mirrors/mirrors.list Index: mirrors.list === RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mirrors.list 1997/11/04 00:56:18 1.31 +++ mirrors.list 1997/11/04 17:41:41 1.32 @@ -67,8 +67,8 @@ http ro http://www.sorosis.ro/ftp/mirrors/www.apache.org/ [EMAIL PROTECTED] http ro http://www.utt.ro/ftp/pub/packages/apache/ [EMAIL PROTECTED] http ru http://www.module.vympel.msk.ru/mirror/apache/ [EMAIL PROTECTED] -http ru http://apache.ifmo.ru/ [EMAIL PROTECTED] -http ru http://www.tomcat.ru/apache/[EMAIL PROTECTED] +http ru http://apache.ifmo.ru/ +http ru http://www.tomcat.ru/apache/[EMAIL PROTECTED] http ru http://apache.inf.ru/ [EMAIL PROTECTED] http se http://www.unit.liu.se/apache/ [EMAIL PROTECTED] http se http://apache.dc.luth.se/ [EMAIL PROTECTED]
cvs commit: apachen/src INDENT
randy 97/09/15 07:42:04 Modified:src INDENT Log: Reserve files to be indented while working on logging. Revision ChangesPath 1.15 +4 -4 apachen/src/INDENT Index: INDENT === RCS file: /export/home/cvs/apachen/src/INDENT,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- INDENT1997/09/15 11:57:03 1.14 +++ INDENT1997/09/15 14:42:03 1.15 @@ -18,10 +18,10 @@ http_conf_globals.h http_config.c http_config.h - http_core.c - http_core.h - http_log.c - http_log.h + http_core.c RESERVED by Randy + http_core.h RESERVED by Randy + http_log.cRESERVED by Randy + http_log.hRESERVED by Randy http_main.c DONE by Dean http_main.h DONE by Dean http_protocol.c DONE by Roy
cvs commit: apachen/src INDENT
randy 97/09/14 14:43:18 Modified:src INDENT Log: Reserve files for indentation. Revision ChangesPath 1.11 +8 -8 apachen/src/INDENT Index: INDENT === RCS file: /export/home/cvs/apachen/src/INDENT,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- INDENT1997/09/14 17:01:53 1.10 +++ INDENT1997/09/14 21:43:16 1.11 @@ -37,14 +37,14 @@ rfc1413.c rfc1413.h scoreboard.h - util.c - util_date.c - util_date.h - util_md5.c - util_md5.h - util_script.c - util_script.h - util_snprintf.c + util.cRESERVED by Randy + util_date.c RESERVED by Randy + util_date.h RESERVED by Randy + util_md5.cRESERVED by Randy + util_md5.hRESERVED by Randy + util_script.c RESERVED by Randy + util_script.h RESERVED by Randy + util_snprintf.c RESERVED by Randy ./modules/example: mod_example.c RESERVED by Ken
cvs commit: apachen/src/main util.c util_date.c util_date.h util_md5.c util_md5.h util_script.c util_script.h util_snprintf.c
randy 97/09/14 15:19:04
Modified:src/main util.c util_date.c util_date.h util_md5.c
util_md5.h util_script.c util_script.h
util_snprintf.c
Log:
indent
Revision ChangesPath
1.69 +693 -594 apachen/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apachen/src/main/util.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- util.c1997/08/28 01:37:00 1.68
+++ util.c1997/09/14 22:18:57 1.69
@@ -61,51 +61,56 @@
#include httpd.h
#include http_conf_globals.h /* for user_id group_id */
-const char month_snames[12][4] = {
-Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
+const char month_snames[12][4] =
+{
+Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct,
Nov, Dec
};
-API_EXPORT(char *) get_time() {
+API_EXPORT(char *) get_time()
+{
time_t t;
char *time_string;
-t=time(NULL);
+t = time(NULL);
time_string = ctime(t);
time_string[strlen(time_string) - 1] = '\0';
return (time_string);
}
-API_EXPORT(char *) ht_time(pool *p, time_t t, const char *fmt, int gmt) {
+API_EXPORT(char *) ht_time(pool *p, time_t t, const char *fmt, int gmt)
+{
char ts[MAX_STRING_LEN];
struct tm *tms;
tms = (gmt ? gmtime(t) : localtime(t));
/* check return code? */
-strftime(ts,MAX_STRING_LEN,fmt,tms);
-return pstrdup (p, ts);
+strftime(ts, MAX_STRING_LEN, fmt, tms);
+return pstrdup(p, ts);
}
-API_EXPORT(char *) gm_timestr_822(pool *p, time_t sec) {
-static const char *const days[7]=
- {Sun,Mon, Tue, Wed, Thu, Fri, Sat};
+API_EXPORT(char *) gm_timestr_822(pool *p, time_t sec)
+{
+static const char *const days[7] =
+{Sun, Mon, Tue, Wed, Thu, Fri, Sat};
char ts[50];
struct tm *tms;
tms = gmtime(sec);
-/* RFC date format; as strftime '%a, %d %b %Y %T GMT' */
-ap_snprintf(ts, sizeof(ts),
- %s, %.2d %s %d %.2d:%.2d:%.2d GMT, days[tms-tm_wday],
- tms-tm_mday, month_snames[tms-tm_mon], tms-tm_year + 1900,
- tms-tm_hour, tms-tm_min, tms-tm_sec);
+/* RFC date format; as strftime '%a, %d %b %Y %T GMT' */
+ap_snprintf(ts, sizeof(ts),
+ %s, %.2d %s %d %.2d:%.2d:%.2d GMT, days[tms-tm_wday],
+ tms-tm_mday, month_snames[tms-tm_mon], tms-tm_year + 1900,
+ tms-tm_hour, tms-tm_min, tms-tm_sec);
-return pstrdup (p, ts);
+return pstrdup(p, ts);
}
/* What a pain in the ass. */
#if defined(HAVE_GMTOFF)
-API_EXPORT(struct tm *) get_gmtoff(int *tz) {
+API_EXPORT(struct tm *) get_gmtoff(int *tz)
+{
time_t tt = time(NULL);
struct tm *t;
@@ -114,18 +119,19 @@
return t;
}
#else
-API_EXPORT(struct tm *) get_gmtoff(int *tz) {
+API_EXPORT(struct tm *) get_gmtoff(int *tz)
+{
time_t tt = time(NULL);
struct tm gmt;
struct tm *t;
int days, hours, minutes;
/* Assume we are never more than 24 hours away. */
-gmt = *gmtime(tt); /* remember gmtime/localtime return ptr to static */
-t = localtime(tt); /* buffer... so be careful */
+gmt = *gmtime(tt); /* remember gmtime/localtime return ptr
to static */
+t = localtime(tt); /* buffer... so be careful */
days = t-tm_yday - gmt.tm_yday;
hours = ((days -1 ? 24 : 1 days ? -24 : days * 24)
- + t-tm_hour - gmt.tm_hour);
+ + t-tm_hour - gmt.tm_hour);
minutes = hours * 60 + t-tm_min - gmt.tm_min;
*tz = minutes;
return t;
@@ -133,62 +139,65 @@
#endif
-/* Match = 0, NoMatch = 1, Abort = -1 */
-/* Based loosely on sections of wildmat.c by Rich Salz
+/* Match = 0, NoMatch = 1, Abort = -1
+ * Based loosely on sections of wildmat.c by Rich Salz
* Hmmm... shouldn't this really go component by component?
*/
-API_EXPORT(int) strcmp_match(const char *str, const char *exp) {
-int x,y;
+API_EXPORT(int) strcmp_match(const char *str, const char *exp)
+{
+int x, y;
-for(x=0,y=0;exp[y];++y,++x) {
-if((!str[x]) (exp[y] != '*'))
-return -1;
-if(exp[y] == '*') {
-while(exp[++y] == '*');
-if(!exp[y])
-return 0;
-while(str[x]) {
-int ret;
-if((ret = strcmp_match(str[x++],exp[y])) != 1)
-return ret;
-}
-return -1;
-} else
-if((exp[y] != '?') (str[x] != exp[y]))
-return 1;
+for (x = 0, y = 0; exp[y]; ++y, ++x) {
+ if ((!str[x]) (exp[y] != '*'))
+ return -1;
+ if (exp[y
cvs commit: apachen/src/support .indent.pro
randy 97/09/14 15:29:59 Added: src/support .indent.pro Log: Add .indent.pro for this directory. Revision ChangesPath 1.1 apachen/src/support/.indent.pro Index: .indent.pro === -i4 -npsl -di0 -br -nce -d0 -cli0 -npcs -nfc1 -TBUFF -TFILE -TTRANS -TUINT4 -T_trans -Tallow_options_t -Tapache_sfio -Tarray_header -Tbool_int -Tbuf_area -Tbuff_struct -Tbuffy -Tcmd_how -Tcmd_parms -Tcommand_rec -Tcommand_struct -Tconn_rec -Tcore_dir_config -Tcore_server_config -Tdir_maker_func -Tevent -Tglobals_s -Thandler_func -Thandler_rec -Tjoblist_s -Tlisten_rec -Tmerger_func -Tmode_t -Tmodule -Tmodule_struct -Tmutex -Tn_long -Tother_child_rec -Toverrides_t -Tparent_score -Tpid_t -Tpiped_log -Tpool -Trequest_rec -Trequire_line -Trlim_t -Tscoreboard -Tsemaphore -Tserver_addr_rec -Tserver_rec -Tserver_rec_chain -Tshort_score -Ttable -Ttable_entry -Tthread -Tu_wide_int -Tvtime_t -Twide_int
cvs commit: apachen/src/support cls.c htdigest.c htpasswd.c logresolve.c rotatelogs.c suexec.c suexec.h
randy 97/09/14 15:48:14
Modified:src/support cls.c htdigest.c htpasswd.c logresolve.c
rotatelogs.c suexec.c suexec.h
Log:
indent
Revision ChangesPath
1.4 +66 -65apachen/src/support/cls.c
Index: cls.c
===
RCS file: /export/home/cvs/apachen/src/support/cls.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cls.c 1996/11/03 21:02:30 1.3
+++ cls.c 1997/09/14 22:48:08 1.4
@@ -14,150 +14,151 @@
* * - swallow remaining characters
* x - exact match for any other character
*/
-static int
-checkmask(const char *data, const char *mask)
+static int checkmask(const char *data, const char *mask)
{
int i, ch, d;
-for (i=0; mask[i] != '\0' mask[i] != '*'; i++)
-{
+for (i = 0; mask[i] != '\0' mask[i] != '*'; i++) {
ch = mask[i];
d = data[i];
- if (ch == '@')
- {
- if (!isupper(d)) return 0;
- } else if (ch == '$')
- {
- if (!islower(d)) return 0;
- } else if (ch == '#')
- {
- if (!isdigit(d)) return 0;
- } else if (ch == '')
- {
- if (!isxdigit(d)) return 0;
- } else if (ch != d) return 0;
+ if (ch == '@') {
+ if (!isupper(d))
+ return 0;
+ }
+ else if (ch == '$') {
+ if (!islower(d))
+ return 0;
+ }
+ else if (ch == '#') {
+ if (!isdigit(d))
+ return 0;
+ }
+ else if (ch == '') {
+ if (!isxdigit(d))
+ return 0;
+ }
+ else if (ch != d)
+ return 0;
}
-if (mask[i] == '*') return 1;
-else return (data[i] == '\0');
+if (mask[i] == '*')
+ return 1;
+else
+ return (data[i] == '\0');
}
/*
* Converts 8 hex digits to a time integer
*/
-static int
-hex2sec(const char *x)
+static int hex2sec(const char *x)
{
int i, ch;
unsigned int j;
-for (i=0, j=0; i 8; i++)
-{
+for (i = 0, j = 0; i 8; i++) {
ch = x[i];
j = 4;
- if (isdigit(ch)) j |= ch - '0';
- else if (isupper(ch)) j |= ch - ('A' - 10);
- else j |= ch - ('a' - 10);
+ if (isdigit(ch))
+ j |= ch - '0';
+ else if (isupper(ch))
+ j |= ch - ('A' - 10);
+ else
+ j |= ch - ('a' - 10);
}
-if (j == 0x) return -1; /* so that it works with 8-byte ints */
-else return j;
+if (j == 0x)
+ return -1; /* so that it works with 8-byte ints */
+else
+ return j;
}
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
{
int i, ver;
DIR *d;
struct dirent *e;
const char *s;
FILE *fp;
-char path[FILENAME_MAX+1];
+char path[FILENAME_MAX + 1];
char line[1035];
time_t date, lmod, expire;
unsigned int len;
struct tm ts;
char sdate[30], slmod[30], sexpire[30];
-const char time_format[]=%e %b %Y %R;
+const char time_format[] = %e %b %Y %R;
-if (argc != 2)
-{
+if (argc != 2) {
printf(Usage: cls directory\n);
exit(0);
}
d = opendir(argv[1]);
-if (d == NULL)
-{
+if (d == NULL) {
perror(opendir);
exit(1);
}
-for (;;)
-{
+for (;;) {
e = readdir(d);
- if (e == NULL) break;
+ if (e == NULL)
+ break;
s = e-d_name;
- if (s[0] == '.' || s[0] == '#') continue;
+ if (s[0] == '.' || s[0] == '#')
+ continue;
sprintf(path, %s/%s, argv[1], s);
fp = fopen(path, r);
- if (fp == NULL)
- {
+ if (fp == NULL) {
perror(fopen);
continue;
}
- if (fgets(line, 1034, fp) == NULL)
- {
+ if (fgets(line, 1034, fp) == NULL) {
perror(fgets);
fclose(fp);
continue;
}
- if (!checkmask(line, \n))
- {
+ if (!checkmask(line, \n))
{
fprintf(stderr, Bad cache file\n);
fclose(fp);
continue;
}
date = hex2sec(line);
- lmod = hex2sec(line+9);
- expire = hex2sec(line+18);
- ver = hex2sec(line+27);
- len = hex2sec(line+35);
- if (fgets(line, 1034, fp) == NULL)
- {
+ lmod = hex2sec(line + 9);
+ expire = hex2sec(line + 18);
+ ver = hex2sec(line + 27);
+ len = hex2sec(line + 35);
+ if (fgets(line, 1034, fp) == NULL) {
perror(fgets);
fclose(fp);
continue;
}
fclose(fp);
i = strlen(line);
- if (strncmp(line, X-URL: , 7) != 0 || line[i-1] != '\n
cvs commit: apachen/src INDENT
randy 97/09/14 15:49:49 Modified:src INDENT Log: Update INDENT Revision ChangesPath 1.13 +7 -7 apachen/src/INDENT Index: INDENT === RCS file: /export/home/cvs/apachen/src/INDENT,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- INDENT1997/09/14 22:20:33 1.12 +++ INDENT1997/09/14 22:49:48 1.13 @@ -133,10 +133,10 @@ utils.h DONE ./support: - cls.c RESERVED by Randy - htdigest.cRESERVED by Randy - htpasswd.cRESERVED by Randy - logresolve.c RESERVED by Randy - rotatelogs.c RESERVED by Randy - suexec.c RESERVED by Randy - suexec.h RESERVED by Randy + cls.c DONE by Randy + htdigest.cDONE by Randy + htpasswd.cDONE by Randy + logresolve.c DONE by Randy + rotatelogs.c DONE by Randy + suexec.c DONE by Randy + suexec.h DONE by Randy
cvs commit: apachen/src/main http_log.c
randy 97/09/09 19:35:39
Modified:src/main http_log.c
Log:
Attempt to make syslog support more portable as suggested by Alexei.
Revision ChangesPath
1.32 +34 -0 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- http_log.c1997/08/31 22:14:07 1.31
+++ http_log.c1997/09/10 02:35:37 1.32
@@ -75,26 +75,60 @@
#ifdef LOG_AUTHPRIV
{authpriv,LOG_AUTHPRIV},
#endif
+#ifdef LOG_CRON
{cron, LOG_CRON},
+#endif
+#ifdef LOG_DAEMON
{daemon, LOG_DAEMON},
+#endif
#ifdef LOG_FTP
{ftp, LOG_FTP},
#endif
+#ifdef LOG_KERN
{kern, LOG_KERN},
+#endif
+#ifdef LOG_LPR
{lpr, LOG_LPR},
+#endif
+#ifdef LOG_MAIL
{mail, LOG_MAIL},
+#endif
+#ifdef LOG_NEWS
{news, LOG_NEWS},
+#endif
+#ifdef LOG_SYSLOG
{syslog, LOG_SYSLOG},
+#endif
+#ifdef LOG_USER
{user, LOG_USER},
+#endif
+#ifdef LOG_UUCP
{uucp, LOG_UUCP},
+#endif
+#ifdef LOG_LOCAL0
{local0, LOG_LOCAL0},
+#endif
+#ifdef LOG_LOCAL1
{local1, LOG_LOCAL1},
+#endif
+#ifdef LOG_LOCAL2
{local2, LOG_LOCAL2},
+#endif
+#ifdef LOG_LOCAL3
{local3, LOG_LOCAL3},
+#endif
+#ifdef LOG_LOCAL4
{local4, LOG_LOCAL4},
+#endif
+#ifdef LOG_LOCAL5
{local5, LOG_LOCAL5},
+#endif
+#ifdef LOG_LOCAL6
{local6, LOG_LOCAL6},
+#endif
+#ifdef LOG_LOCAL7
{local7, LOG_LOCAL7},
+#endif
{NULL, -1},
};
#endif
cvs commit: apachen/src/main http_main.c http_protocol.c
randy 97/09/02 21:54:55
Modified:src/main http_main.c http_protocol.c
Log:
Logging tweaks.
Revision ChangesPath
1.214 +1 -1 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- http_main.c 1997/08/31 20:13:05 1.213
+++ http_main.c 1997/09/03 04:54:48 1.214
@@ -689,7 +689,7 @@
if (timeout_req != NULL) dirconf = timeout_req-per_dir_config;
else dirconf = current_conn-server-lookup_defaults;
if (sig == SIGPIPE) {
-ap_snprintf(errstr, sizeof(errstr), %s lost connection to client
%s,
+ap_snprintf(errstr, sizeof(errstr), %s lost connection to %s,
timeout_name ? timeout_name : request,
get_remote_host(current_conn, dirconf, REMOTE_NAME));
} else {
1.158 +3 -3 apachen/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- http_protocol.c 1997/09/01 02:46:47 1.157
+++ http_protocol.c 1997/09/03 04:54:52 1.158
@@ -1671,7 +1671,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r-server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
send body lost connection to %s,
get_remote_host(r-connection,
r-per_dir_config,
REMOTE_NAME));
@@ -1750,7 +1750,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r-server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
send body lost connection to %s,
get_remote_host(r-connection,
r-per_dir_config,
REMOTE_NAME));
@@ -1812,7 +1812,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r-server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
send mmap lost connection to %s,
get_remote_host(r-connection,
r-per_dir_config,
REMOTE_NAME));
cvs commit: apachen/src/main http_main.c
randy 97/08/31 13:13:08
Modified:src/main http_main.c
Log:
Begin conversion of log_*() to aplog_error(). Change some code style to
Apache format while we're at it.
Revision ChangesPath
1.213 +163 -149 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- http_main.c 1997/08/28 01:36:59 1.212
+++ http_main.c 1997/08/31 20:13:05 1.213
@@ -540,8 +540,8 @@
continue;
if (ret 0) {
- log_unixerr(fcntl, F_SETLKW, Error getting accept lock. Exiting!,
- server_conf);
+ aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ fcntl: F_SETLKW: Error getting accept lock. Exiting!);
exit(1);
}
}
@@ -550,8 +550,8 @@
{
if (fcntl (lock_fd, F_SETLKW, unlock_it) 0)
{
- log_unixerr(fcntl, F_SETLKW, Error freeing accept lock. Exiting!,
- server_conf);
+ aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ fcntl: F_SETLKW: Error freeing accept lock. Exiting!);
exit(1);
}
}
@@ -571,10 +571,9 @@
expand_lock_fname (p);
lock_fd = popenf(p, lock_fname, O_CREAT | O_WRONLY | O_EXCL, 0644);
-if (lock_fd == -1)
-{
- perror (open);
- fprintf (stderr, Cannot open lock file: %s\n, lock_fname);
+if (lock_fd == -1) {
+ aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ Cannot open lock file: %s\n, lock_fname);
exit (1);
}
unlink(lock_fname);
@@ -588,8 +587,8 @@
continue;
if (ret 0) {
- log_unixerr(flock, LOCK_EX, Error getting accept lock. Exiting!,
- server_conf);
+ aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ flock: LOCK_EX: Error getting accept lock. Exiting!);
exit(1);
}
}
@@ -598,8 +597,8 @@
{
if (flock (lock_fd, LOCK_UN) 0)
{
- log_unixerr(flock, LOCK_UN, Error freeing accept lock. Exiting!,
- server_conf);
+ aplog_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ flock: LOCK_UN: Error freeing accept lock. Exiting!);
exit(1);
}
}
@@ -691,17 +690,17 @@
else dirconf = current_conn-server-lookup_defaults;
if (sig == SIGPIPE) {
ap_snprintf(errstr, sizeof(errstr), %s lost connection to client
%s,
- timeout_name ? timeout_name : request,
- get_remote_host(current_conn, dirconf, REMOTE_NAME));
+ timeout_name ? timeout_name : request,
+ get_remote_host(current_conn, dirconf, REMOTE_NAME));
} else {
ap_snprintf(errstr, sizeof(errstr), %s timed out for %s,
- timeout_name ? timeout_name : request,
- get_remote_host(current_conn, dirconf, REMOTE_NAME));
+ timeout_name ? timeout_name : request,
+ get_remote_host(current_conn, dirconf, REMOTE_NAME));
}
if (!current_conn-keptalive)
- log_error(errstr, current_conn-server);
-
+ aplog_error(APLOG_MARK, APLOG_WARNING, current_conn-server, errstr);
+
if (timeout_req) {
/* Someone has asked for this transaction to just be aborted
* if it times out...
@@ -930,7 +929,7 @@
if (setsockopt(s, SOL_SOCKET, SO_LINGER,
(char *)li, sizeof(struct linger)) 0) {
-log_unixerr(setsockopt, (SO_LINGER), NULL, server_conf);
+aplog_error(APLOG_MARK, APLOG_WARNING, server_conf, setsockopt:
(SO_LINGER));
/* not a fatal error */
}
}
@@ -1231,7 +1230,7 @@
}
ap_snprintf(errstr, sizeof(errstr), created shared memory segment #%d,
shmid);
-log_error(errstr, server_conf);
+aplog_error(APLOG_MARK, APLOG_INFO, server_conf, errstr);
#ifdef MOVEBREAK
/*
@@ -1282,8 +1281,10 @@
if (shmctl(shmid, IPC_RMID, NULL) != 0) {
perror(shmctl);
fprintf(stderr, httpd: Could not delete segment #%d\n, shmid);
- ap_snprintf(errstr, sizeof(errstr), could not remove shared memory
segment #%d, shmid);
- log_unixerr(shmctl,IPC_RMID,errstr, server_conf);
+ ap_snprintf(errstr, sizeof(errstr),
+ could not remove shared memory segment #%d, shmid);
+ aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
+ shmctl: IPC_RMID: %s, errstr);
}
if (scoreboard_image == BADSHMAT)/* now bailout */
exit(1);
@@ -1628,17 +1629,23 @@
switch (tries) {
case 1:
/* perhaps it missed the SIGHUP, lets try again
cvs commit: apachen/src/main http_config.c http_core.c http_log.c http_protocol.c http_request.c rfc1413.c util_script.c
randy 97/08/31 14:28:59
Modified:src/main http_config.c http_core.c http_log.c
http_protocol.c http_request.c rfc1413.c
util_script.c
Log:
Complete conversion of src/main/* to aplog_error(). On to the modules...
Revision ChangesPath
1.78 +8 -7 apachen/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- http_config.c 1997/08/27 05:45:34 1.77
+++ http_config.c 1997/08/31 21:28:49 1.78
@@ -934,9 +934,9 @@
while (!f access_name[0]) {
char *w = getword_conf(r-pool, access_name);
filename = make_full_path(r-pool, d, w);
- f=pfopen(r-pool, filename, r);
+ f = pfopen(r-pool, filename, r);
}
-if(f) {
+if (f) {
dc = create_per_dir_config (r-pool);
parms.infile = f;
@@ -947,18 +947,19 @@
pfclose(r-pool, f);
if (errmsg) {
- log_reason (errmsg, filename, r);
+ aplog_error(APLOG_MARK, APLOG_ALERT, r-server, %s: %s, filename,
errmsg);
return SERVER_ERROR;
}
*result = dc;
-} else {
+}
+else {
if (errno == ENOENT || errno == ENOTDIR)
dc = NULL;
else {
- log_unixerr(pfopen, filename,
- unable to check htaccess file, ensure it is readable,
- r-server);
+ aplog_error(APLOG_MARK, APLOG_CRIT, r-server,
+ %s pfopen: unable to check htaccess file, ensure it is
readable,
+ filename);
return HTTP_FORBIDDEN;
}
}
1.116 +23 -18apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- http_core.c 1997/08/27 05:45:35 1.115
+++ http_core.c 1997/08/31 21:28:50 1.116
@@ -1224,14 +1224,14 @@
rlim_t cur = 0;
rlim_t max = 0;
-*plimit=(struct rlimit *)pcalloc(cmd-pool,sizeof **plimit);
-limit=*plimit;
-if ((getrlimit(type, limit)) != 0)
- {
+*plimit = (struct rlimit *)pcalloc(cmd-pool,sizeof **plimit);
+limit = *plimit;
+if ((getrlimit(type, limit)) != 0) {
*plimit = NULL;
- log_unixerr(getrlimit,cmd-cmd-name,failed,cmd-server);
+ aplog_error(APLOG_MARK, APLOG_ERR, cmd-server,
+ %s: getrlimit failed, cmd-cmd-name);
return;
- }
+}
if ((str = getword_conf(cmd-pool, arg)))
if (!strcasecmp(str, max))
@@ -1239,7 +1239,8 @@
else
cur = atol(str);
else {
- log_printf(cmd-server, Invalid parameters for %s, cmd-cmd-name);
+ aplog_error(APLOG_MARK, APLOG_ERR, cmd-server,
+ Invalid parameters for %s, cmd-cmd-name);
return;
}
@@ -1250,8 +1251,8 @@
if (geteuid()) {
limit-rlim_cur = cur;
if (max)
- log_printf(cmd-server, Must be uid 0 to raise maximum %s,
- cmd-cmd-name);
+ aplog_error(APLOG_MARK, APLOG_ERR, cmd-server,
+ Must be uid 0 to raise maximum %s, cmd-cmd-name);
}
else {
if (cur)
@@ -1266,8 +1267,8 @@
static const char *no_set_limit (cmd_parms *cmd, core_dir_config *conf,
char *arg, char *arg2)
{
-log_printf(cmd-server, %s not supported on this platform,
-cmd-cmd-name);
+aplog_error(APLOG_MARK, APLOG_ERR, cmd-server,
+ %s not supported on this platform, cmd-cmd-name);
return NULL;
}
#endif
@@ -1542,7 +1543,8 @@
if (r-proxyreq) return HTTP_FORBIDDEN;
if ((r-uri[0] != '/') strcmp(r-uri, *)) {
- log_printf(r-server, Invalid URI in request %s, r-the_request);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ Invalid URI in request %s, r-the_request);
return BAD_REQUEST;
}
@@ -1603,16 +1605,17 @@
r-allowed |= (1 M_OPTIONS);
if (r-method_number == M_INVALID) {
- log_printf(r-server, Invalid method in request %s, r-the_request);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ Invalid method in request %s, r-the_request);
return NOT_IMPLEMENTED;
}
if (r-method_number == M_OPTIONS) return send_http_options(r);
if (r-method_number == M_PUT) return METHOD_NOT_ALLOWED;
if (r-finfo.st_mode == 0 || (r-path_info *r-path_info)) {
- log_reason(File does not exist,
- r
cvs commit: apachen/src/modules/standard mod_access.c
randy 97/08/31 14:31:00
Modified:src/modules/standard mod_access.c
Log:
Convert log_*() to aplog_error().
Revision ChangesPath
1.24 +2 -1 apachen/src/modules/standard/mod_access.c
Index: mod_access.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_access.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_access.c 1997/08/18 13:12:07 1.23
+++ mod_access.c 1997/08/31 21:30:59 1.24
@@ -342,7 +342,8 @@
if (ret == FORBIDDEN (
satisfies(r) != SATISFY_ANY || !some_auth_required(r)
)) {
- log_reason (Client denied by server configuration, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ Client denied by server configuration: %s, r-filename);
}
return ret;
cvs commit: apachen/src/modules/standard mod_actions.c
randy 97/08/31 14:33:09
Modified:src/modules/standard mod_actions.c
Log:
Convert log_*() to aplog_error().
Revision ChangesPath
1.17 +2 -1 apachen/src/modules/standard/mod_actions.c
Index: mod_actions.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_actions.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_actions.c 1997/08/18 13:12:08 1.16
+++ mod_actions.c 1997/08/31 21:33:08 1.17
@@ -181,7 +181,8 @@
action ? action : default_type(r {
script = t;
if (r-finfo.st_mode == 0) {
- log_reason(File does not exist, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ File does not exist: %s, r-filename);
return NOT_FOUND;
}
}
cvs commit: apachen/src/main http_log.c
randy 97/08/31 15:14:09
Modified:src/main http_log.c
Log:
Fix a warning.
Revision ChangesPath
1.31 +0 -1 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- http_log.c1997/08/31 21:28:51 1.30
+++ http_log.c1997/08/31 22:14:07 1.31
@@ -160,7 +160,6 @@
#ifdef HAVE_SYSLOG
else if (!strncasecmp(s-error_fname, syslog, 6)) {
- register TRANS *fac;
if ((fname = strchr(s-error_fname, ':'))) {
fname++;
for (fac = facilities; fac-t_name; fac++) {
cvs commit: apachen/src/modules/standard mod_auth_dbm.c
randy 97/08/31 15:23:22
Modified:src/modules/standard mod_auth_dbm.c
Log:
Convert log_*() to aplog_error().
Style changes.
Revision ChangesPath
1.28 +34 -29apachen/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_auth_dbm.c1997/08/24 16:43:26 1.27
+++ mod_auth_dbm.c1997/08/31 22:23:20 1.28
@@ -151,7 +151,8 @@
module dbm_auth_module;
-static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile) {
+static char *get_dbm_pw (request_rec *r, char *user, char *auth_dbmpwfile)
+{
DBM *f;
datum d, q;
char *pw = NULL;
@@ -164,15 +165,16 @@
#endif
-if(!(f=dbm_open(auth_dbmpwfile,O_RDONLY,0664))) {
-log_reason (could not open dbm auth file, auth_dbmpwfile, r);
+if (!(f=dbm_open(auth_dbmpwfile,O_RDONLY,0664))) {
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ could not open dbm auth file: %s, auth_dbmpwfile);
return NULL;
}
d = dbm_fetch(f, q);
if (d.dptr) {
-pw = palloc (r-pool, d.dsize + 1);
+pw = palloc(r-pool, d.dsize + 1);
strncpy(pw,d.dptr,d.dsize);
pw[d.dsize] = '\0'; /* Terminate the string */
}
@@ -209,36 +211,36 @@
static int dbm_authenticate_basic_user (request_rec *r)
{
dbm_auth_config_rec *sec =
- (dbm_auth_config_rec *)get_module_config (r-per_dir_config,
- dbm_auth_module);
+ (dbm_auth_config_rec *)get_module_config(r-per_dir_config,
+ dbm_auth_module);
conn_rec *c = r-connection;
char *sent_pw, *real_pw, *colon_pw;
char errstr[MAX_STRING_LEN];
int res;
-if ((res = get_basic_auth_pw (r, sent_pw)))
+if ((res = get_basic_auth_pw(r, sent_pw)))
return res;
-if(!sec-auth_dbmpwfile)
+if (!sec-auth_dbmpwfile)
return DECLINED;
if(!(real_pw = get_dbm_pw(r, c-user, sec-auth_dbmpwfile))) {
if (!(sec-auth_dbmauthoritative))
return DECLINED;
ap_snprintf(errstr, sizeof(errstr), DBM user %s not found,
c-user);
- log_reason (errstr, r-filename, r);
- note_basic_auth_failure (r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, %s: %s, errstr,
r-filename);
+ note_basic_auth_failure(r);
return AUTH_REQUIRED;
}
/* Password is up to first : if exists */
colon_pw = strchr(real_pw,':');
if (colon_pw) *colon_pw='\0';
/* anyone know where the prototype for crypt is? */
-if(strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
+if (strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
ap_snprintf(errstr, sizeof(errstr),
- user %s: password mismatch,c-user);
- log_reason (errstr, r-uri, r);
- note_basic_auth_failure (r);
+ user %s: password mismatch,c-user);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, %s: %s, errstr, r-uri);
+ note_basic_auth_failure(r);
return AUTH_REQUIRED;
}
return OK;
@@ -246,15 +248,16 @@
/* Checking ID */
-static int dbm_check_auth(request_rec *r) {
+static int dbm_check_auth (request_rec *r)
+{
dbm_auth_config_rec *sec =
- (dbm_auth_config_rec *)get_module_config (r-per_dir_config,
- dbm_auth_module);
+ (dbm_auth_config_rec *)get_module_config(r-per_dir_config,
+ dbm_auth_module);
char *user = r-connection-user;
int m = r-method_number;
char errstr[MAX_STRING_LEN];
-array_header *reqs_arr = requires (r);
+array_header *reqs_arr = requires(r);
require_line *reqs = reqs_arr ? (require_line *)reqs_arr-elts : NULL;
register int x;
@@ -264,14 +267,14 @@
if (!sec-auth_dbmgrpfile) return DECLINED;
if (!reqs_arr) return DECLINED;
-for(x=0; x reqs_arr-nelts; x++) {
+for (x = 0; x reqs_arr-nelts; x++) {
if (! (reqs[x].method_mask (1 m))) continue;
t = reqs[x].requirement;
w = getword(r-pool, t, ' ');
-if(!strcmp(w,group) sec-auth_dbmgrpfile) {
+if (!strcmp(w,group) sec-auth_dbmgrpfile) {
const char *orig_groups,*groups;
char *v;
@@ -279,25 +282,27 @@
if (!(sec-auth_dbmauthoritative))
return DECLINED;
ap_snprintf(errstr, sizeof(errstr),
- user %s not in DBM group file %s
cvs commit: apachen/src/modules/standard mod_auth_db.c
randy 97/08/31 15:24:50
Modified:src/modules/standard mod_auth_db.c
Log:
Convert log_*() to aplog_error().
Style changes.
Revision ChangesPath
1.21 +30 -28apachen/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_auth_db.c 1997/08/23 04:00:35 1.20
+++ mod_auth_db.c 1997/08/31 22:24:49 1.21
@@ -134,7 +134,8 @@
module db_auth_module;
-static char *get_db_pw(request_rec *r, char *user, const char
*auth_dbpwfile) {
+static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
+{
DB *f;
DBT d, q;
char *pw = NULL;
@@ -142,13 +143,14 @@
q.data = user;
q.size = strlen(q.data);
-if(!(f=dbopen(auth_dbpwfile,O_RDONLY,0664,DB_HASH,NULL))) {
-log_reason (could not open db auth file, auth_dbpwfile, r);
+if (!(f = dbopen(auth_dbpwfile,O_RDONLY,0664,DB_HASH,NULL))) {
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ could not open db auth file: %s, auth_dbpwfile);
return NULL;
}
if (!((f-get)(f,q,d,0))) {
-pw = palloc (r-pool, d.size + 1);
+pw = palloc(r-pool, d.size + 1);
strncpy(pw,d.data,d.size);
pw[d.size] = '\0'; /* Terminate the string */
}
@@ -185,36 +187,35 @@
static int db_authenticate_basic_user (request_rec *r)
{
db_auth_config_rec *sec =
- (db_auth_config_rec *)get_module_config (r-per_dir_config,
+ (db_auth_config_rec *)get_module_config(r-per_dir_config,
db_auth_module);
conn_rec *c = r-connection;
char *sent_pw, *real_pw, *colon_pw;
char errstr[MAX_STRING_LEN];
int res;
-if ((res = get_basic_auth_pw (r, sent_pw)))
+if ((res = get_basic_auth_pw(r, sent_pw)))
return res;
-if(!sec-auth_dbpwfile)
+if (!sec-auth_dbpwfile)
return DECLINED;
-if(!(real_pw = get_db_pw(r, c-user, sec-auth_dbpwfile))) {
+if (!(real_pw = get_db_pw(r, c-user, sec-auth_dbpwfile))) {
if (!(sec - auth_dbauthoritative))
return DECLINED;
ap_snprintf(errstr, sizeof(errstr), DB user %s not found, c-user);
- log_reason (errstr, r-filename, r);
- note_basic_auth_failure (r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, %s: %s, errstr,
r-filename);
+ note_basic_auth_failure(r);
return AUTH_REQUIRED;
}
/* Password is up to first : if exists */
colon_pw = strchr(real_pw,':');
if (colon_pw) *colon_pw='\0';
/* anyone know where the prototype for crypt is? */
-if(strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
-ap_snprintf(errstr, sizeof(errstr),
- user %s: password mismatch,c-user);
- log_reason (errstr, r-uri, r);
- note_basic_auth_failure (r);
+if (strcmp(real_pw,(char *)crypt(sent_pw,real_pw))) {
+ap_snprintf(errstr, sizeof(errstr), user %s: password
mismatch,c-user);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, %s: %s, errstr, r-uri);
+ note_basic_auth_failure(r);
return AUTH_REQUIRED;
}
return OK;
@@ -222,9 +223,10 @@
/* Checking ID */
-static int db_check_auth(request_rec *r) {
+static int db_check_auth(request_rec *r)
+{
db_auth_config_rec *sec =
- (db_auth_config_rec *)get_module_config (r-per_dir_config,
+ (db_auth_config_rec *)get_module_config(r-per_dir_config,
db_auth_module);
char *user = r-connection-user;
int m = r-method_number;
@@ -240,14 +242,14 @@
if (!sec-auth_dbgrpfile) return DECLINED;
if (!reqs_arr) return DECLINED;
-for(x=0; x reqs_arr-nelts; x++) {
+for (x = 0; x reqs_arr-nelts; x++) {
if (! (reqs[x].method_mask (1 m))) continue;
t = reqs[x].requirement;
w = getword(r-pool, t, ' ');
-if(!strcmp(w,group) sec-auth_dbgrpfile) {
+if (!strcmp(w,group) sec-auth_dbgrpfile) {
const char *orig_groups,*groups;
char *v;
@@ -255,25 +257,25 @@
if (!(sec-auth_dbauthoritative))
return DECLINED;
ap_snprintf(errstr, sizeof(errstr),
- user %s not in DB group file %s,
- user, sec-auth_dbgrpfile);
-log_reason (errstr, r-filename, r);
-note_basic_auth_failure (r);
+user %s not in DB group file %s,
+user, sec-auth_dbgrpfile
cvs commit: apachen/src/modules/standard mod_autoindex.c
randy 97/08/31 15:47:51
Modified:src/modules/standard mod_autoindex.c
Log:
Conver log_*() to aplog_error().
Style changes. One change to correct problems Emacs was having with formating.
Revision ChangesPath
1.47 +14 -11apachen/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mod_autoindex.c 1997/08/23 02:55:31 1.46
+++ mod_autoindex.c 1997/08/31 22:47:49 1.47
@@ -961,7 +961,8 @@
char direction;
if (!(d = popendir(r-pool, name))) {
-log_reason (Can't open directory for index, r-filename, r);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ Can't open directory for index: %s, r-filename);
return HTTP_FORBIDDEN;
}
@@ -1037,10 +1038,10 @@
p = p-next;
}
-qsort((void *)ar, num_ent, sizeof(struct ent *),
#ifdef ULTRIX_BRAIN_DEATH
- (int (*))dsortf);
+qsort((void *)ar, num_ent, sizeof(struct ent *), (int (*))dsortf);
#else
+qsort((void *)ar, num_ent, sizeof(struct ent *),
(int (*)(const void *, const void *))dsortf);
#endif
}
@@ -1048,13 +1049,13 @@
direction);
pclosedir(r-pool, d);
-if (autoindex_opts FANCY_INDEXING)
+if (autoindex_opts FANCY_INDEXING) {
if ((tmp = find_readme(autoindex_conf, r)))
insert_readme(name, tmp, , HRULE, END_MATTER, r);
-else {
-rputs(/UL, r);
+ else {
+ rputs(/UL, r);
+ }
}
-
rputs (/BODY/HTML\n, r);
kill_timeout(r);
@@ -1066,8 +1067,8 @@
static int handle_autoindex (request_rec *r)
{
autoindex_config_rec *d =
- (autoindex_config_rec *)get_module_config (r-per_dir_config,
- autoindex_module);
+ (autoindex_config_rec *)get_module_config(r-per_dir_config,
+ autoindex_module);
int allow_opts = allow_options (r);
if (r-method_number != M_GET) return NOT_IMPLEMENTED;
@@ -1084,8 +1085,10 @@
r-filename = pstrcat (r-pool, r-filename, /, NULL);
}
return index_directory (r, d);
-} else {
-log_reason (Directory index forbidden by rule, r-filename, r);
+}
+ else {
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ Directory index forbidden by rule: %s, r-filename);
return HTTP_FORBIDDEN;
}
}
cvs commit: apachen/src/modules/standard mod_cern_meta.c
randy 97/08/31 15:53:14
Modified:src/modules/standard mod_cern_meta.c
Log:
Convert log_*() to aplog_error().
Style changes.
Revision ChangesPath
1.19 +20 -16apachen/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_cern_meta.c 1997/08/23 02:19:01 1.18
+++ mod_cern_meta.c 1997/08/31 22:53:12 1.19
@@ -236,41 +236,42 @@
else w[p-1] = '\0';
}
-if(w[0] == '\0') {
+if (w[0] == '\0') {
return OK;
}
/* if we see a bogus header don't ignore it. Shout and scream */
-if(!(l = strchr(w,':'))) {
- log_reason (malformed header in meta file, r-filename, r);
+if (!(l = strchr(w,':'))) {
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ malformed header in meta file: %s, r-filename);
return SERVER_ERROR;
}
*l++ = '\0';
while (*l isspace (*l)) ++l;
-if(!strcasecmp(w,Content-type)) {
+if (!strcasecmp(w,Content-type)) {
/* Nuke trailing whitespace */
char *endp = l + strlen(l) - 1;
while (endp l isspace(*endp)) *endp-- = '\0';
- r-content_type = pstrdup (r-pool, l);
+ r-content_type = pstrdup(r-pool, l);
}
-else if(!strcasecmp(w,Status)) {
+else if (!strcasecmp(w,Status)) {
sscanf(l, %d, r-status);
r-status_line = pstrdup(r-pool, l);
}
else {
- table_set (r-headers_out, w, l);
+ table_set(r-headers_out, w, l);
}
}
return OK;
}
-int add_cern_meta_data(request_rec *r)
+int add_cern_meta_data (request_rec *r)
{
char *metafilename;
char *last_slash;
@@ -281,7 +282,7 @@
int rv;
request_rec *rr;
-dconf = get_module_config (r-per_dir_config, cern_meta_module);
+dconf = get_module_config(r-per_dir_config, cern_meta_module);
if (!dconf-metafiles) {
return DECLINED;
@@ -308,9 +309,11 @@
real_file = last_slash;
real_file++;
*last_slash = '\0';
-} else {
+}
+else {
/* no last slash, buh?! */
-log_reason(internal error in mod_cern_meta, r-filename, r);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ internal error in mod_cern_meta, r-filename);
/* should really barf, but hey, let's be friends... */
return DECLINED;
};
@@ -326,19 +329,20 @@
* A better solution might be a safe open feature of pfopen to avoid
* pipes, symlinks, and crap like that.
*/
-rr = sub_req_lookup_file (metafilename, r);
+rr = sub_req_lookup_file(metafilename, r);
if (rr-status != HTTP_OK) {
- destroy_sub_req (rr);
+ destroy_sub_req(rr);
return DECLINED;
}
-destroy_sub_req (rr);
+destroy_sub_req(rr);
-f = pfopen (r-pool, metafilename, r);
+f = pfopen(r-pool, metafilename, r);
if (f == NULL) {
if (errno == ENOENT) {
return DECLINED;
}
-log_reason(meta file permissions deny server access, metafilename,
r);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ meta file permissions deny server access: %s,
metafilename);
return FORBIDDEN;
};
cvs commit: apachen/src/modules/standard mod_cgi.c
randy 97/08/31 15:59:09
Modified:src/modules/standard mod_cgi.c
Log:
Convert log_*() to aplog_error().
Revision ChangesPath
1.55 +12 -11apachen/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cgi.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_cgi.c 1997/08/18 13:12:11 1.54
+++ mod_cgi.c 1997/08/31 22:59:08 1.55
@@ -155,12 +155,12 @@
{ NULL}
};
-static int log_scripterror(request_rec *r, cgi_server_conf *conf, int ret,
- char *error)
+static int log_scripterror (request_rec *r, cgi_server_conf *conf, int ret,
+ char *error)
{
FILE *f;
-log_reason(error, r-filename, r);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server, error, r-filename);
if (!conf-logname ||
((stat(server_root_relative(r-pool, conf-logname), r-finfo) == 0)
@@ -182,8 +182,8 @@
return ret;
}
-static int log_script(request_rec *r, cgi_server_conf *conf, int ret,
- char *dbuf, char *sbuf, BUFF *script_in, BUFF *script_err)
+static int log_script (request_rec *r, cgi_server_conf *conf, int ret,
+char *dbuf, char *sbuf, BUFF *script_in, BUFF
*script_err)
{
table *hdrs_arr = r-headers_in;
table_entry *hdrs = (table_entry *)hdrs_arr-elts;
@@ -323,7 +323,7 @@
*
* Oh, well. Muddle through as best we can...
*
- * (NB we can't use log_error, or anything like that, because we
+ * (NB we can't use aplog_error, or anything like that, because we
* just closed the file descriptor which r-server-error_log
* was tied to in cleanup_for_exec(). It's only available on stderr
* now, so that's what we use).
@@ -412,11 +412,12 @@
* SSI request -djg
*/
if (!(child_pid =
- spawn_child_err_buff (r-main ? r-main-pool : r-pool, cgi_child,
- (void *)cld,
- kill_after_timeout,
- script_out, script_in, script_err))) {
-log_reason (couldn't spawn child process, r-filename, r);
+ spawn_child_err_buff(r-main ? r-main-pool : r-pool, cgi_child,
+(void *)cld,
+kill_after_timeout,
+script_out, script_in, script_err))) {
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ couldn't spawn child process: %s, r-filename);
return SERVER_ERROR;
}
cvs commit: apachen/src/modules/standard mod_expires.c
randy 97/08/31 16:11:28
Modified:src/modules/standard mod_expires.c
Log:
Convert log_*() to aplog_error().
Revision ChangesPath
1.17 +4 -2 apachen/src/modules/standard/mod_expires.c
Index: mod_expires.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_expires.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_expires.c 1997/08/18 13:12:12 1.16
+++ mod_expires.c 1997/08/31 23:11:27 1.17
@@ -402,7 +402,8 @@
conf = (expires_dir_config *)get_module_config(r-per_dir_config,
expires_module);
if ( conf == NULL ) {
-log_reason (internal error in expires_module; add_expires(), conf
== NULL, r-filename, r);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ internal error: %s, r-filename);
return SERVER_ERROR;
};
@@ -451,7 +452,8 @@
/* expecting the add_* routines to be case-hardened this
* is just a reminder that module is beta
*/
-log_reason (internal error in expires_module; bad expires
code, r-filename, r);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ internal error: bad expires code: %s, r-filename);
return SERVER_ERROR;
};
cvs commit: apachen/src/modules/standard mod_info.c
randy 97/08/31 18:36:47
Modified:src/modules/standard mod_info.c
Log:
Convert log_*() to aplog_error().
Revision ChangesPath
1.27 +1 -1 apachen/src/modules/standard/mod_info.c
Index: mod_info.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_info.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_info.c1997/08/31 13:30:52 1.26
+++ mod_info.c1997/09/01 01:36:45 1.27
@@ -163,7 +163,7 @@
filename,
NULL
);
- log_error (msg, r-server);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, msg);
return NULL;
}
while(!cfg_getline(s,MAX_STRING_LEN,fp)) {
cvs commit: apachen/src/modules/standard mod_status.c mod_unique_id.c
randy 97/08/31 19:49:48
Modified:src/modules/standard mod_status.c mod_unique_id.c
Log:
Complete src/modules/standard module conversion of log_*() to aplog_error.
Revision ChangesPath
1.61 +2 -1 apachen/src/modules/standard/mod_status.c
Index: mod_status.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_status.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mod_status.c 1997/08/18 13:12:18 1.60
+++ mod_status.c 1997/09/01 02:49:44 1.61
@@ -240,7 +240,8 @@
status[SERVER_GRACEFUL]='G';
if (!exists_scoreboard_image()) {
- log_printf(r-server, Server status unavailable in inetd mode);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ Server status unavailable in inetd mode);
return HTTP_NOT_IMPLEMENTED;
}
r-allowed = (1 M_GET) | (1 M_TRACE);
1.2 +13 -7 apachen/src/modules/standard/mod_unique_id.c
Index: mod_unique_id.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_unique_id.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_unique_id.c 1997/08/18 07:17:30 1.1
+++ mod_unique_id.c 1997/09/01 02:49:45 1.2
@@ -144,7 +144,10 @@
*/
if (XtOffsetOf (unique_id_rec, counter) + sizeof (cur_unique_id.counter)
!= 14) {
- log_error (mod_unique_id: sorry the size assumptions are wrong in
mod_unique_id.c, please remove it from your server or fix the code!, s);
+ aplog_error(APLOG_MARK, APLOG_ALERT, s,
+ mod_unique_id: sorry the size assumptions are wrong
+ in mod_unique_id.c, please remove it from your server
+ or fix the code!);
exit (1);
}
@@ -153,20 +156,22 @@
* to be unique as the physical address of the machine
*/
if (gethostname (str, sizeof (str) - 1) != 0) {
- log_unixerr (gethostname, mod_unique_id,
- mod_unique_id requires the hostname of the server, s);
+ aplog_error(APLOG_MARK, APLOG_ALERT, s,
+ gethostname: mod_unique_id requires the hostname of the
server);
exit (1);
}
if ((hent = gethostbyname (str)) == NULL) {
- log_printf (s, mod_unique_id: unable to gethostbyname(\%s\), str);
+ aplog_error(APLOG_MARK, APLOG_ALERT, s,
+ mod_unique_id: unable to gethostbyname(\%s\), str);
exit (1);
}
global_in_addr = ((struct in_addr *)hent-h_addr_list[0])-s_addr;
-log_printf (s, mod_unique_id: using ip addr %s,
- inet_ntoa (*(struct in_addr *)hent-h_addr_list[0]));
+aplog_error(APLOG_MARK, APLOG_INFO, s,
+ mod_unique_id: using ip addr %s,
+ inet_ntoa (*(struct in_addr *)hent-h_addr_list[0]));
/* If the server is pummelled with restart requests we could possibly
* end up in a situation where we're starting again during the same
@@ -219,7 +224,8 @@
* test this during global_init ... but oh well.
*/
if (cur_unique_id.pid != pid) {
- log_error (mod_unique_id: oh no! pids are greater than 16-bits! I'm
broken!, s);
+ aplog_error(APLOG_MARK, APLOG_DEBUG, s,
+ oh no! pids are greater than 16-bits! I'm broken!);
}
cur_unique_id.in_addr = global_in_addr;
cvs commit: apachen/src/modules/proxy mod_proxy.c proxy_connect.c proxy_http.c proxy_util.c
randy 97/08/31 20:07:30
Modified:src/modules/proxy mod_proxy.c proxy_connect.c proxy_http.c
proxy_util.c
Log:
Convert log_*() to aplog_error().
Something needs to be done with proxy_log_uerror() in here. I see no obvious
reason not to replace it with aplog_error() but would like some feedback
first.
Revision ChangesPath
1.23 +9 -9 apachen/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_proxy.c 1997/08/18 13:12:06 1.22
+++ mod_proxy.c 1997/09/01 03:07:26 1.23
@@ -221,9 +221,8 @@
/* Split request into user, password, host, port */
err = proxy_canon_netloc(r-pool, url_copy, user, password, host,
port);
-if (err != NULL)
-{
- log_error(err, r-server);
+if (err != NULL) {
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, err);
return DECLINED;
}
@@ -251,8 +250,10 @@
NULL);
table_set(r-headers_out, Location, nuri);
- log_error(pstrcat(r-pool, Domain missing: , r-uri, sent to ,
nuri,
- ref ? from : NULL, ref, NULL), r-server);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ pstrcat(r-pool, Domain missing: , r-uri, sent to ,
nuri,
+ ref ? from : NULL, ref, NULL));
+
return REDIRECT;
}
}
@@ -307,15 +308,14 @@
for (direct_connect=ii=0; ii conf-dirconn-nelts !direct_connect;
ii++)
{
direct_connect = list[ii].matcher (list[ii], r);
- /*log_error(URI and NoProxy:, r-server);*/
- /*log_error(r-uri, r-server);*/
- /*log_error(list[ii].name, r-server);*/
+ aplog_error(APLOG_MARK, APLOG_DEBUG, r-server,
+ URI and NoProxy: %s: %s, r-uri, list[ii].name);
}
#if DEBUGGING
{
char msg[256];
sprintf (msg, (direct_connect)?NoProxy for %s:UseProxy for %s,
r-uri);
- log_error(msg, r-server);
+ aplog_error(APLOG_MARK, APLOG_DEBUG, r-server, msg);
}
#endif
}
1.14 +2 -1 apachen/src/modules/proxy/proxy_connect.c
Index: proxy_connect.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_connect.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- proxy_connect.c 1997/08/17 13:56:27 1.13
+++ proxy_connect.c 1997/09/01 03:07:27 1.14
@@ -150,7 +150,8 @@
sock = psocket(r-pool, PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (sock == -1)
{
-log_error(proxy: error creating socket, r-server);
+aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ proxy: error creating socket);
return SERVER_ERROR;
}
1.30 +2 -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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- proxy_http.c 1997/08/23 22:59:11 1.29
+++ proxy_http.c 1997/09/01 03:07:27 1.30
@@ -223,7 +223,8 @@
sock = psocket(pool, PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (sock == -1)
{
- log_error(proxy: error creating socket, r-server);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ proxy: error creating socket);
return SERVER_ERROR;
}
1.25 +1 -1 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- proxy_util.c 1997/08/23 22:59:11 1.24
+++ proxy_util.c 1997/09/01 03:07:28 1.25
@@ -831,7 +831,7 @@
err = proxy_canon_netloc(r-pool, url, user, password, host, port);
if (err != NULL)
- log_error(err, r-server);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server, err);
r-hostname = host;
cvs commit: apachen/src/os/win32 mod_isapi.c
randy 97/08/31 21:00:29
Modified:src/os/win32 mod_isapi.c
Log:
More log_*() conversions to aplog_error().
Revision ChangesPath
1.3 +20 -10apachen/src/os/win32/mod_isapi.c
Index: mod_isapi.c
===
RCS file: /export/home/cvs/apachen/src/os/win32/mod_isapi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_isapi.c 1997/08/13 08:37:33 1.2
+++ mod_isapi.c 1997/09/01 04:00:28 1.3
@@ -130,20 +130,23 @@
if (!(isapi_handle = LoadLibraryEx(r-filename, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH))) {
- log_reason(Could not load DLL, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ALERT, r-server,
+ Could not load DLL: %s, r-filename);
return SERVER_ERROR;
}
if (!(isapi_version =
(void *)(GetProcAddress(isapi_handle, GetExtensionVersion {
- log_reason(DLL could not load GetExtensionVersion(), r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ALERT, r-server,
+ DLL could not load GetExtensionVersion(): %s,
r-filename);
FreeLibrary(isapi_handle);
return SERVER_ERROR;
}
if (!(isapi_entry =
(void *)(GetProcAddress(isapi_handle, HttpExtensionProc {
- log_reason(DLL could not load HttpExtensionProc(), r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ALERT, r-server,
+ DLL could not load HttpExtensionProc(): %s, r-filename);
FreeLibrary(isapi_handle);
return SERVER_ERROR;
}
@@ -153,7 +156,8 @@
/* Run GetExtensionVersion() */
if ((*isapi_version)(pVer) != TRUE) {
- log_reason(ISAPI GetExtensionVersion() failed, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ALERT, r-server,
+ ISAPI GetExtensionVersion() failed: %s, r-filename);
FreeLibrary(isapi_handle);
return SERVER_ERROR;
}
@@ -243,7 +247,8 @@
/* Check for a log message - and log it */
if (ecb-lpszLogData strcmp(ecb-lpszLogData, ))
- log_reason(ecb-lpszLogData, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ %s: %s, ecb-lpszLogData, r-filename);
/* All done with the DLL... get rid of it */
if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD);
@@ -261,7 +266,8 @@
return OK;
case HSE_STATUS_PENDING: /* We don't support this */
- log_reason(ISAPI asynchronous I/O not supported, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
+ ISAPI asynchronous I/O not supported: %s, r-filename);
case HSE_STATUS_ERROR:
default:
return SERVER_ERROR;
@@ -321,7 +327,8 @@
/* We only support synchronous writing */
if (dwReserved dwReserved != HSE_IO_SYNC) {
- log_reason(ISAPI asynchronous I/O not supported, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
+ ISAPI asynchronous I/O not supported: %s, r-filename);
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
@@ -401,7 +408,8 @@
int p;
if (!lf) { /* Huh? Invalid data, I think */
- log_reason(ISA sent invalid headers, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ ISA sent invalid headers: %s, r-filename);
SetLastError(ERROR);/* XXX: Find right error */
return FALSE;
}
@@ -419,7 +427,8 @@
if (!(value = strchr(data, ':'))) {
SetLastError(ERROR);/* XXX: Find right error */
- log_reason(ISA sent invalid headers, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r-server,
+ ISA sent invalid headers, r-filename);
return FALSE;
}
@@ -492,7 +501,8 @@
/* We don't support all this async I/O, Microsoft-specific stuff */
case HSE_REQ_IO_COMPLETION:
case HSE_REQ_TRANSMIT_FILE:
- log_reason(ISAPI asynchronous I/O not supported, r-filename, r);
+ aplog_error(APLOG_MARK, APLOG_WARNING, r-server,
+ ISAPI asynchronous I/O not supported: %s, r-filename);
default:
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
cvs commit: apachen/src/main http_config.h
randy 97/08/31 21:14:49 Modified:src/main http_config.h Log: Bump the MODULE_MAGIC_NUMBER to indicated aplog_error() addition. Revision ChangesPath 1.47 +1 -1 apachen/src/main/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apachen/src/main/http_config.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- http_config.h 1997/08/25 16:02:28 1.46 +++ http_config.h 1997/09/01 04:14:48 1.47 @@ -246,7 +246,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970825 +#define MODULE_MAGIC_NUMBER 19970831 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apachen/src/main conf.h http_log.c
randy 97/08/27 07:22:09 Modified:src/main conf.h http_log.c Log: HAVE_SYSLOG. Added #define for most platforms erroring on the optimistic side. Revision ChangesPath 1.129 +28 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- conf.h1997/08/24 18:24:03 1.128 +++ conf.h1997/08/27 14:22:06 1.129 @@ -93,6 +93,7 @@ #define NO_LINGCLOSE #define USE_FLOCK_SERIALIZED_ACCEPT #define NEED_DIFFTIME +#define HAVE_SYSLOG #elif defined(SOLARIS2) #undef HAVE_GMTOFF @@ -109,6 +110,7 @@ #define USE_MMAP_FILES #define HAVE_CRYPT_H int gethostname(char *name, int namelen); +#define HAVE_SYSLOG #elif defined(IRIX) #undef HAVE_GMTOFF @@ -125,6 +127,7 @@ #define NO_LONG_DOUBLE #define HAVE_BSTRING_H #define NO_LINGCLOSE +#define HAVE_SYSLOG #elif defined(HIUX) #define HAVE_SYS_RESOURCE_H @@ -137,6 +140,7 @@ #define JMP_BUF sigjmp_buf #define HAVE_SHMGET #define SELECT_NEEDS_CAST +#define HAVE_SYSLOG #elif defined(HPUX) || defined(HPUX10) #define HAVE_SYS_RESOURCE_H @@ -148,6 +152,7 @@ #endif #define JMP_BUF sigjmp_buf #define HAVE_SHMGET +#define HAVE_SYSLOG #ifndef HPUX10 #define SELECT_NEEDS_CAST typedef int rlim_t; @@ -162,6 +167,7 @@ #ifndef __ps2__ #define HAVE_MMAP #define USE_MMAP_FILES +#define HAVE_SYSLOG #ifndef DEFAULT_GROUP #define DEFAULT_GROUP nobody #endif @@ -184,6 +190,7 @@ #define const /* Not implemented */ #endif #define JMP_BUF sigjmp_buf +#define HAVE_SYSLOG #elif defined(OSF1) #define HAVE_GMTOFF @@ -194,6 +201,7 @@ #define USE_MMAP_FILES #define HAVE_CRYPT_H #define NO_LONG_DOUBLE +#define HAVE_SYSLOG #elif defined(PARAGON) #define HAVE_GMTOFF @@ -204,6 +212,7 @@ #define USE_MMAP_FILES #define HAVE_CRYPT_H #define NO_LONG_DOUBLE +#define HAVE_SYSLOG typedef int rlim_t; #elif defined(SEQUENT) @@ -211,6 +220,7 @@ #undef NO_KILLPG #define NO_SETSID #define NEED_STRDUP +#define HAVE_SYSLOG #define tolower(c) (isupper(c) ? tolower(c) : c) #elif defined(NEXT) @@ -271,6 +281,7 @@ #define JMP_BUF jmp_buf #define USE_LONGJMP #define NO_USE_SIGACTION +#define HAVE_SYSLOG #elif defined(LINUX) #if LINUX 1 @@ -295,6 +306,7 @@ #undef NEED_STRDUP #define JMP_BUF sigjmp_buf #include sys/time.h +#define HAVE_SYSLOG #elif defined(SCO) #undef HAVE_GMTOFF @@ -305,6 +317,7 @@ #define JMP_BUF sigjmp_buf #define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */ #include sys/time.h +#define HAVE_SYSLOG #elif defined(SCO5) @@ -316,6 +329,7 @@ #define USE_MMAP_FILES #define HAVE_SYS_RESOURCE_H #define SecureWare +#define HAVE_SYSLOG /* Although SCO 5 defines these in strings.h (note the s) they don't have consts. Sigh. */ @@ -355,6 +369,7 @@ #define MOVEBREAK0x400 #define NO_LINGCLOSE #define NO_SLACK +#define HAVE_SYSLOG #elif defined(SVR4) #define NO_KILLPG @@ -368,6 +383,7 @@ #define JMP_BUF sigjmp_buf /* A lot of SVR4 systems need this */ #define USE_FCNTL_SERIALIZED_ACCEPT +#define HAVE_SYSLOG #elif defined(UW) #define NO_LINGCLOSE @@ -388,6 +404,7 @@ #include sys/time.h #define _POSIX_SOURCE #define NET_SIZE_T size_t +#define HAVE_SYSLOG #elif defined(DGUX) #define NO_KILLPG @@ -400,6 +417,7 @@ /* A lot of SVR4 systems need this */ #define USE_FCNTL_SERIALIZED_ACCEPT #define ap_inet_addr inet_network +#define HAVE_SYSLOG #elif defined(__NetBSD__) || defined(__OpenBSD__) #define HAVE_SYS_RESOURCE_H @@ -407,6 +425,7 @@ #undef NO_KILLPG #undef NO_SETSID #define JMP_BUF sigjmp_buf +#define HAVE_SYSLOG #ifndef DEFAULT_USER #define DEFAULT_USER nobody #endif @@ -422,6 +441,7 @@ #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 +#define HAVE_SYSLOG #define strftime(buf,bufsize,fmt,tm)ascftime(buf,fmt,tm) #include sys/types.h @@ -429,6 +449,7 @@ #undef HAVE_GMTOFF #undef NO_KILLPG #undef NO_SETSID +#define HAVE_SYSLOG #elif defined(__FreeBSD__) || defined(__bsdi__) #if defined(__FreeBSD__) @@ -452,6 +473,7 @@ typedef quad_t rlim_t; #endif #define USE_FLOCK_SERIALIZED_ACCEPT +#define HAVE_SYSLOG #elif defined(QNX) #ifndef crypt @@ -472,6 +494,7 @@ #include unix.h #define JMP_BUF sigjmp_buf #define HAVE_MMAP +#define HAVE_SYSLOG #elif defined(LYNXOS) #undef NO_KILLPG @@ -480,6 +503,7 @@ #define NEED_STRNCASECMP #define
cvs commit: apachen/src/main http_log.c
randy 97/08/27 08:49:14
Modified:src/main http_log.c
Log:
Revision ChangesPath
1.28 +1 -0 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- http_log.c1997/08/27 14:22:07 1.27
+++ http_log.c1997/08/27 15:49:13 1.28
@@ -246,6 +246,7 @@
if (s-error_log) {
fprintf(s-error_log, [%s] %s, get_time(), errstr);
vfprintf(s-error_log, fmt, args);
+ fprintf(s-error_log, \n);
fflush(s-error_log);
}
#ifdef HAVE_SYSLOG
cvs commit: apachen/src/main http_config.c http_core.c http_log.c http_log.h httpd.h
randy 97/08/26 22:45:41
Modified:src CHANGES
src/main http_config.c http_core.c http_log.c http_log.h
httpd.h
Log:
Backoff aplog_error() to be configureable on a per-server basis.
Attempt to fix portability issues with syslog().
Convert existing log functions to wrappers for aplog_error().
Add #ifdef USE_SYSLOG
Revision ChangesPath
1.423 +1 -1 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- CHANGES 1997/08/27 01:12:18 1.422
+++ CHANGES 1997/08/27 05:45:14 1.423
@@ -22,7 +22,7 @@
*) Add aplog_error() providing a mechanism to define levels of
verbosity to the server error logging. This addition also provides
the ablity to log errors using syslogd. Error logging is configurable
- on a per-directory basis using the LogLevel directive. Conversion
+ on a per-server basis using the LogLevel directive. Conversion
of log_*() in progress. [Randy Terbush]
*) Canonicalise filenames under Win32. Short filenames are
1.77 +3 -0 apachen/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- http_config.c 1997/08/26 00:00:54 1.76
+++ http_config.c 1997/08/27 05:45:34 1.77
@@ -1081,6 +1081,8 @@
s-keep_alive = -1;
s-keep_alive_max = -1;
s-error_log = main_server-error_log;
+s-loglevel = main_server-loglevel;
+
/* start the list of addreses */
addrs = s-addrs;
while( hostname[0] ) {
@@ -1201,6 +1203,7 @@
s-server_hostname = NULL;
s-error_fname = DEFAULT_ERRORLOG;
s-error_log = stderr;
+s-loglevel = DEFAULT_LOGLEVEL;
s-srm_confname = RESOURCE_CONFIG_FILE;
s-access_confname = ACCESS_CONFIG_FILE;
s-timeout = DEFAULT_TIMEOUT;
1.115 +10 -12apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- http_core.c 1997/08/25 02:00:38 1.114
+++ http_core.c 1997/08/27 05:45:35 1.115
@@ -130,8 +130,6 @@
conf-limit_nproc = NULL;
#endif
-conf-loglevel = DEFAULT_LOGLEVEL;
-
conf-sec = make_array (a, 2, sizeof(void *));
return (void *)conf;
@@ -1374,27 +1372,27 @@
return NULL;
}
-const char *set_loglevel (cmd_parms *cmd, core_dir_config *conf, const char
*arg)
+const char *set_loglevel (cmd_parms *cmd, void *dummy, const char *arg)
{
char *str;
if ((str = getword_conf(cmd-pool, arg))) {
if (!strcasecmp(str, emerg))
-conf-loglevel = APLOG_EMERG;
+cmd-server-loglevel = APLOG_EMERG;
else if (!strcasecmp(str, alert))
-conf-loglevel = APLOG_ALERT;
+cmd-server-loglevel = APLOG_ALERT;
else if (!strcasecmp(str, crit))
-conf-loglevel = APLOG_CRIT;
+cmd-server-loglevel = APLOG_CRIT;
else if (!strcasecmp(str, error))
-conf-loglevel = APLOG_ERR;
+cmd-server-loglevel = APLOG_ERR;
else if (!strcasecmp(str, warn))
-conf-loglevel = APLOG_WARNING;
+cmd-server-loglevel = APLOG_WARNING;
else if (!strcasecmp(str, notice))
-conf-loglevel = APLOG_NOTICE;
+cmd-server-loglevel = APLOG_NOTICE;
else if (!strcasecmp(str, info))
-conf-loglevel = APLOG_INFO;
+cmd-server-loglevel = APLOG_INFO;
else if (!strcasecmp(str, debug))
-conf-loglevel = APLOG_DEBUG;
+cmd-server-loglevel = APLOG_DEBUG;
}
else
return LogLevel requires level keyword;
@@ -1528,7 +1526,7 @@
{ ListenBacklog, set_listenbacklog, NULL, RSRC_CONF, TAKE1, maximum
length of the queue of pending connections, as used by listen(2) },
{ CoreDumpDirectory, set_coredumpdir, NULL, RSRC_CONF, TAKE1, The
location of the directory Apache changes to before dumping core },
{ Include, include_config, NULL, RSRC_CONF, TAKE1, config file to be
included },
-{ LogLevel, set_loglevel, (void*)XtOffsetOf(core_dir_config, loglevel),
OR_ALL, TAKE1, set level of verbosity in error logging },
+{ LogLevel, set_loglevel, NULL, RSRC_CONF, TAKE1, set level of verbosity
in error logging },
{ NULL },
};
1.26 +44 -63apachen/src/main/http_log.c
Index: http_log.c
cvs commit: apachen/src/main http_log.c
randy 97/08/25 07:53:41
Modified:src/main http_log.c
Log:
Comment out syslog support temporarily until I can come up with a more
portable option.
Revision ChangesPath
1.25 +2 -0 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- http_log.c1997/08/25 14:26:29 1.24
+++ http_log.c1997/08/25 14:53:39 1.25
@@ -248,12 +248,14 @@
vfprintf(r-server-error_log, fmt, args);
fflush(r-server-error_log);
}
+#ifdef NOTYET
else {
if (errstr)
syslog(level, %s, errstr);
vsyslog(level, fmt, args);
}
+#endif
va_end(args);
}
cvs commit: apachen/src/main http_core.c http_core.h http_log.c http_log.h
randy 97/08/24 19:00:43
Modified:src CHANGES
src/main http_core.c http_core.h http_log.c http_log.h
Log:
Add LogLevels functionality through the addition of aplog_error().
This change also provides the ability to log errors via syslogd.
Reviewed by: Dean Gaudet, Jim Jagielski, Ken Coar
Revision ChangesPath
1.418 +6 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- CHANGES 1997/08/24 18:46:16 1.417
+++ CHANGES 1997/08/25 02:00:27 1.418
@@ -1,5 +1,11 @@
Changes with Apache 1.3a2
+ *) Add aplog_error() providing a mechanism to define levels of
+ verbosity to the server error logging. This addition also provides
+ the ablity to log errors using syslogd. Error logging is configurable
+ on a per-directory basis using the LogLevel directive. Conversion
+ of log_*() in progress. [Randy Terbush]
+
*) Canonicalise filenames under Win32. Short filenames are
converted to long ones. Backslashes are converted to forward
slashes. Case is converted to lower. Parts of URLs that do not
1.114 +31 -0 apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- http_core.c 1997/08/23 01:52:51 1.113
+++ http_core.c 1997/08/25 02:00:38 1.114
@@ -130,6 +130,8 @@
conf-limit_nproc = NULL;
#endif
+conf-loglevel = DEFAULT_LOGLEVEL;
+
conf-sec = make_array (a, 2, sizeof(void *));
return (void *)conf;
@@ -1372,6 +1374,34 @@
return NULL;
}
+const char *set_loglevel (cmd_parms *cmd, core_dir_config *conf, const char
*arg)
+{
+ char *str;
+
+ if ((str = getword_conf(cmd-pool, arg))) {
+ if (!strcasecmp(str, emerg))
+conf-loglevel = APLOG_EMERG;
+ else if (!strcasecmp(str, alert))
+conf-loglevel = APLOG_ALERT;
+ else if (!strcasecmp(str, crit))
+conf-loglevel = APLOG_CRIT;
+ else if (!strcasecmp(str, error))
+conf-loglevel = APLOG_ERR;
+ else if (!strcasecmp(str, warn))
+conf-loglevel = APLOG_WARNING;
+ else if (!strcasecmp(str, notice))
+conf-loglevel = APLOG_NOTICE;
+ else if (!strcasecmp(str, info))
+conf-loglevel = APLOG_INFO;
+ else if (!strcasecmp(str, debug))
+conf-loglevel = APLOG_DEBUG;
+ }
+ else
+ return LogLevel requires level keyword;
+
+ return NULL;
+}
+
/* Note --- ErrorDocument will now work from .htaccess files.
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
@@ -1498,6 +1528,7 @@
{ ListenBacklog, set_listenbacklog, NULL, RSRC_CONF, TAKE1, maximum
length of the queue of pending connections, as used by listen(2) },
{ CoreDumpDirectory, set_coredumpdir, NULL, RSRC_CONF, TAKE1, The
location of the directory Apache changes to before dumping core },
{ Include, include_config, NULL, RSRC_CONF, TAKE1, config file to be
included },
+{ LogLevel, set_loglevel, (void*)XtOffsetOf(core_dir_config, loglevel),
OR_ALL, TAKE1, set level of verbosity in error logging },
{ NULL },
};
1.28 +3 -0 apachen/src/main/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apachen/src/main/http_core.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- http_core.h 1997/08/23 16:17:12 1.27
+++ http_core.h 1997/08/25 02:00:39 1.28
@@ -189,6 +189,9 @@
struct rlimit *limit_nproc;
#endif
+/* logging options */
+int loglevel;
+
/* Access control */
array_header *sec;
regex_t *r;
1.22 +144 -33 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- http_log.c1997/07/21 05:53:43 1.21
+++ http_log.c1997/08/25 02:00:40 1.22
@@ -58,15 +58,52 @@
*/
+#define CORE_PRIVATE
#include httpd.h
#include http_config.h
#include http_core.h
#include http_log.h
#include stdarg.h
+#include syslog.h
-static int
-error_log_child (void *cmd)
+static TRANS facilities[] = {
+{auth, LOG_AUTH},
+{authpriv,LOG_AUTHPRIV},
+{cron, LOG_CRON},
+{daemon
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/core http_core.c
randy 97/08/22 18:52:53
Modified:src CHANGES
src/core http_core.c
Log:
Add 'Include' directive.
Revision ChangesPath
1.407 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- CHANGES 1997/08/22 08:10:11 1.406
+++ CHANGES 1997/08/23 01:52:37 1.407
@@ -1,5 +1,8 @@
Changes with Apache 1.3a2
+ *) Add 'Include' directive to allow inclusion of configuration
+ files within configuration files. [Randy Terbush]
+
*) Proxy errors on connect() are logged to the error_log (nothing
new); now they include the IP address and port that failed
(*that's* new). PR#352 [Ken Coar, Marc Slemko]
1.113 +10 -0 apachen/src/core/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/core/http_core.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- http_core.c 1997/08/18 07:19:34 1.112
+++ http_core.c 1997/08/23 01:52:51 1.113
@@ -1363,6 +1363,15 @@
return NULL;
}
+const char *include_config (cmd_parms *cmd, void *dummy, char *name)
+{
+name = server_root_relative(cmd-pool, name);
+
+process_resource_config(cmd-server, name, cmd-pool, cmd-temp_pool);
+
+return NULL;
+}
+
/* Note --- ErrorDocument will now work from .htaccess files.
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
@@ -1488,6 +1497,7 @@
{ ExcessRequestsPerChild, set_excess_requests, NULL, RSRC_CONF, TAKE1,
Maximum number of requests a particular child serves after it is ready to
die. },
{ ListenBacklog, set_listenbacklog, NULL, RSRC_CONF, TAKE1, maximum
length of the queue of pending connections, as used by listen(2) },
{ CoreDumpDirectory, set_coredumpdir, NULL, RSRC_CONF, TAKE1, The
location of the directory Apache changes to before dumping core },
+{ Include, include_config, NULL, RSRC_CONF, TAKE1, config file to be
included },
{ NULL },
};
cvs commit: apachen/src/modules/standard mod_cern_meta.c
randy 97/08/22 19:19:04
Modified:src/modules/standard mod_cern_meta.c
Log:
This version of mod_cern_meta.c controls Meta File behaviour on a
per-directory basis. Previous versions of the module defined behaviour
on a per-server basis. The upshot is that you'll need to revisit your
configuration files in order to make use of the new module.
Submitted by: David J. MacKenzie [EMAIL PROTECTED]
Reviewed by: Dean Gaudet, Brian Behlendorf, Randy Terbush
Revision ChangesPath
1.18 +78 -34apachen/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_cern_meta.c 1997/08/18 13:12:10 1.17
+++ mod_cern_meta.c 1997/08/23 02:19:01 1.18
@@ -52,11 +52,18 @@
/*
* mod_cern_meta.c
- * version 0.0.5
+ * version 0.1.0
* status beta
*
* Andrew Wilson [EMAIL PROTECTED] 25.Jan.96
*
+ * *** IMPORTANT ***
+ * This version of mod_cern_meta.c controls Meta File behaviour on a
+ * per-directory basis. Previous versions of the module defined behaviour
+ * on a per-server basis. The upshot is that you'll need to revisit your
+ * configuration files in order to make use of the new module.
+ * ***
+ *
* Emulate the CERN HTTPD Meta file semantics. Meta files are HTTP
* headers that can be output in addition to the normal range of
* headers for each file accessed. They appear rather like the Apache
@@ -67,8 +74,16 @@
* who can exploit this module. It should be noted that there are probably
* more sensitive ways of managing the Expires: header specifically.
*
- * The module obeys the following directives, which can only appear
- * in the server's .conf files and not in any .htaccess file.
+ * The module obeys the following directives, which can appear
+ * in the server's .conf files and in .htaccess files.
+ *
+ * MetaFiles on|off
+ *
+ *turns on|off meta file processing for any directory.
+ *Default value is off
+ *
+ *# turn on MetaFiles in this directory
+ *MetaFiles on
*
* MetaDir directory name
*
@@ -122,7 +137,10 @@
* need to report missing ones as spurious errors.
* 31.Jan.96 log_error reports about a malformed .meta file, rather
* than a script error.
- *
+ * 20.Jun.96 MetaFiles on|off default off, added, so that module
+ * can be configured per-directory. Prior to this the module
+ * was running for each request anywhere on the server, naughty..
+ * 29.Jun.96 All directives made per-directory.
*/
#include httpd.h
@@ -133,51 +151,70 @@
#include http_log.h
#include http_request.h
+#define DIR_CMD_PERMS OR_INDEXES
+
#define DEFAULT_METADIR .web
#define DEFAULT_METASUFFIX .meta
+#define DEFAULT_METAFILES0
module MODULE_VAR_EXPORT cern_meta_module;
typedef struct {
- char *metadir;
- char *metasuffix;
-} cern_meta_config;
+char *metadir;
+char *metasuffix;
+char *metafiles;
+} cern_meta_dir_config;
-void *create_cern_meta_config (pool *p, server_rec *dummy)
+void *create_cern_meta_dir_config (pool *p, char *dummy)
{
-cern_meta_config *new =
- (cern_meta_config *) palloc (p, sizeof(cern_meta_config));
-
-new-metadir = DEFAULT_METADIR;
-new-metasuffix = DEFAULT_METASUFFIX;
+cern_meta_dir_config *new =
+ (cern_meta_dir_config *)palloc(p, sizeof(cern_meta_dir_config));
+
+new-metadir = NULL;
+new-metasuffix = NULL;
+new-metafiles = DEFAULT_METAFILES;
+
+return new;
+}
+
+void *merge_cern_meta_dir_configs (pool *p, void *basev, void *addv)
+{
+cern_meta_dir_config *base = (cern_meta_dir_config *)basev;
+cern_meta_dir_config *add = (cern_meta_dir_config *)addv;
+cern_meta_dir_config *new =
+ (cern_meta_dir_config *)palloc(p, sizeof(cern_meta_dir_config));
+new-metadir = add-metadir ? add-metadir : base-metadir;
+new-metasuffix = add-metasuffix ? add-metasuffix : base-metasuffix;
+new-metafiles = add-metafiles;
+
return new;
}
-const char *set_metadir (cmd_parms *parms, void *dummy, char *arg)
+const char *set_metadir (cmd_parms *parms, cern_meta_dir_config *dconf, char
*arg)
{
-cern_meta_config *cmc ;
-
-cmc = get_module_config (parms-server-module_config,
- cern_meta_module);
-cmc-metadir = arg;
+dconf-metadir = arg;
return NULL;
}
-const char *set_metasuffix (cmd_parms *parms, void *dummy, char *arg)
+const char *set_metasuffix (cmd_parms *parms, cern_meta_dir_config *dconf,
char
cvs commit: apachen/src CHANGES
randy 97/08/22 19:23:37 Modified:src CHANGES Log: Update CHANGES with mod_cern_meta changes. Revision ChangesPath 1.408 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.407 retrieving revision 1.408 diff -u -r1.407 -r1.408 --- CHANGES 1997/08/23 01:52:37 1.407 +++ CHANGES 1997/08/23 02:23:34 1.408 @@ -1,5 +1,8 @@ Changes with Apache 1.3a2 + *) Change mod_cern_meta to be configurable on a per-directory basis. + [David J. MacKenzie] + *) Add 'Include' directive to allow inclusion of configuration files within configuration files. [Randy Terbush]
cvs commit: apachen/src/modules/standard mod_autoindex.c
randy 97/08/22 19:55:33
Modified:src CHANGES
src/modules/standard mod_autoindex.c
Log:
Check for titles in server-parsed HTML files.
Ignore leading newlines and returns in titles. The old behavior
of replacing a newline after title with a space causes the
title to be misaligned in the listing.
Submitted by: David J. MacKenzie [EMAIL PROTECTED]
Reviewed by: Dean Gaudet, Brian Behlendorf, Randy Terbush
Revision ChangesPath
1.409 +5 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- CHANGES 1997/08/23 02:23:34 1.408
+++ CHANGES 1997/08/23 02:55:22 1.409
@@ -1,5 +1,10 @@
Changes with Apache 1.3a2
+ *) Check for titles in server-parsed HTML files.
+ Ignore leading newlines and returns in titles. The old behavior
+ of replacing a newline after title with a space causes the
+ title to be misaligned in the listing. [David J. MacKenzie]
+
*) Change mod_cern_meta to be configurable on a per-directory basis.
[David J. MacKenzie]
1.46 +9 -2 apachen/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mod_autoindex.c 1997/08/18 13:12:10 1.45
+++ mod_autoindex.c 1997/08/23 02:55:31 1.46
@@ -583,7 +583,11 @@
if (r-status != HTTP_OK) {
return NULL;
}
-if (r-content_type !strcmp(r-content_type, text/html)
!r-content_encoding) {
+if (r-content_type
+ (!strcmp(r-content_type,text/html)
+ || !strcmp(r-content_type,INCLUDES_MAGIC_TYPE))
+ !r-content_encoding)
+{
if (!(thefile = pfopen(r-pool, r-filename, r)))
return NULL;
n = fread(titlebuf, sizeof(char), MAX_STRING_LEN - 1, thefile);
@@ -596,7 +600,10 @@
/* Scan for line breaks for Tanmoy's secretary */
for (y = x; titlebuf[y]; y++)
if ((titlebuf[y] == CR) || (titlebuf[y] == LF))
-titlebuf[y] = ' ';
+ if (y==x)
+ x++;
+ else
+ titlebuf[y] = ' ';
pfclose (r-pool, thefile);
return pstrdup(r-pool, titlebuf[x]);
}
cvs commit: apachen/src/modules/standard mod_log_config.c
randy 97/08/22 19:59:46
Modified:src CHANGES
src/modules/standard mod_log_config.c
Log:
If no TransferLog is given explicitly, decline to log.
This supports coexistence with other logging modules,
such as the custom one that UUNET uses.
Submitted by: David J. MacKenzie [EMAIL PROTECTED]
Reviewed by: Dean Gaudet, Brian Behlendorf, Randy Terbush
Revision ChangesPath
1.410 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- CHANGES 1997/08/23 02:55:22 1.409
+++ CHANGES 1997/08/23 02:59:36 1.410
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) If no TransferLog is given explicitly, decline
+ to log. This supports coexistence with other logging modules,
+ such as the custom one that UUNET uses. [David J. MacKenzie]
+
*) Check for titles in server-parsed HTML files.
Ignore leading newlines and returns in titles. The old behavior
of replacing a newline after title with a space causes the
1.36 +11 -0 apachen/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_log_config.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_log_config.c 1997/08/18 13:12:14 1.35
+++ mod_log_config.c 1997/08/23 02:59:45 1.36
@@ -51,6 +51,9 @@
*/
/*
+ * Modified by [EMAIL PROTECTED]:
+ * If no TransferLog is given explicitly, decline to log.
+ *
* This is module implements the TransferLog directive (same as the
* common log module), and additional directives, LogFormat and CustomLog.
*
@@ -532,6 +535,10 @@
int len = 0;
array_header *format;
+if (cls-fname == NULL) {
+ return DECLINED;
+}
+
format = cls-format ? cls-format : default_format;
strsa= make_array(r-pool, format-nelts,sizeof(char*));
@@ -703,6 +710,10 @@
config_log_state *cls,
array_header *default_format) {
if (cls-log_fd 0) return cls; /* virtual config shared w/main server
*/
+
+if (cls-fname == NULL) {
+ return cls; /* Leave it NULL to decline. */
+}
if (*cls-fname == '|') {
FILE *dummy;
cvs commit: apachen/htdocs/manual/mod core.html directives.html
randy 97/08/22 20:10:56 Modified:htdocs/manual/mod core.html directives.html Log: Document 'Include' Revision ChangesPath 1.72 +11 -0 apachen/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- core.html 1997/08/14 01:24:49 1.71 +++ core.html 1997/08/23 03:10:53 1.72 @@ -42,6 +42,7 @@ liA HREF=#hostnamelookupsHostNameLookups/A liA HREF=#identitycheckIdentityCheck/A liA HREF=#ifmodulelt;IfModulegt;/A +liA HREF=#includelt;Includegt;/A liA HREF=#keepaliveKeepAlive/A liA HREF=#keepalivetimeoutKeepAliveTimeout/A liA HREF=#limitlt;Limitgt;/A @@ -721,6 +722,16 @@ plt;IfModulegt; sections are nest-able, which can be used to implement simple multiple-module tests. + +P hr + +h2a name=includeInclude directive/a/h2 +strongSyntax: (Apache 1.2)/strong Include emfilename/embr +strongContext:/strong server configbr +strongStatus:/strong Corebr +strongCompatibility:/strong Include is only available in Apache 1.3 and later. +P +This directive allows inclusion of other configuration files from within the server configuration files. P hr 1.30 +1 -0 apachen/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/directives.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- directives.html 1997/08/03 20:29:16 1.29 +++ directives.html 1997/08/23 03:10:54 1.30 @@ -101,6 +101,7 @@ liA HREF=mod_imap.html#imapbaseImapBase/A liA HREF=mod_imap.html#imapdefaultImapDefault/A liA HREF=mod_imap.html#imapmenuImapMenu/A +liA HREF=core.html#includeInclude/A liA HREF=mod_autoindex.html#indexignoreIndexIgnore/A liA HREF=mod_autoindex.html#indexoptionsIndexOptions/A liA HREF=core.html#keepaliveKeepAlive/A
cvs commit: apachen/src Makefile.tmpl
randy 97/08/22 20:36:13 Modified:src Makefile.tmpl Log: Cleanup after core dir rename. Revision ChangesPath 1.58 +10 -10apachen/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- Makefile.tmpl 1997/08/21 08:55:34 1.57 +++ Makefile.tmpl 1997/08/23 03:36:09 1.58 @@ -9,12 +9,12 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) OBJS= \ - core/alloc.o core/http_main.o core/http_core.o \ - core/http_config.o core/http_request.o core/http_log.o \ - core/http_protocol.o core/rfc1413.o core/util.o \ - core/util_script.o core/buff.o core/md5c.o \ - core/util_md5.o core/explain.o core/http_bprintf.o \ - core/util_date.o core/util_snprintf.o core/fnmatch.o \ + main/alloc.o main/http_main.o main/http_core.o \ + main/http_config.o main/http_request.o main/http_log.o \ + main/http_protocol.o main/rfc1413.o main/util.o \ + main/util_script.o main/buff.o main/md5c.o \ + main/util_md5.o main/explain.o main/http_bprintf.o \ + main/util_date.o main/util_snprintf.o main/fnmatch.o \ modules.o \ $(OSOBJ) \ $(MODULES) @@ -47,14 +47,14 @@ cd support; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' core-dir: - cd core; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' + cd main; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' os-dir: cd $(OSDIR); $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' clean: rm -f httpd *.o $(OBJS) - cd core; $(MAKE) clean + cd main; $(MAKE) clean cd regex; $(MAKE) clean cd modules; $(MAKE) clean cd support; $(MAKE) clean @@ -81,5 +81,5 @@ $(OBJS): Makefile # DO NOT REMOVE -modules.o: modules.c core/httpd.h core/conf.h core/alloc.h core/buff.h \ - core/http_config.h +modules.o: modules.c main/httpd.h main/conf.h main/alloc.h main/buff.h \ + main/http_config.h
cvs commit: apachen/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
randy 97/08/22 21:00:38 Modified:src Apache.mak ApacheCore.mak Configure src/main http_config.c http_config.h src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c Log: More cleanup for core - main. Revision ChangesPath 1.5 +1 -1 apachen/src/Apache.mak Index: Apache.mak === RCS file: /export/home/cvs/apachen/src/Apache.mak,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Apache.mak1997/08/13 08:37:13 1.4 +++ Apache.mak1997/08/23 04:00:16 1.5 @@ -159,7 +159,7 @@ !IF $(CFG) == Apache - Win32 Release || $(CFG) == Apache - Win32 Debug -SOURCE=.\core\dummy.c +SOURCE=.\main\dummy.c $(INTDIR)\dummy.obj : $(SOURCE) $(INTDIR) $(CPP) $(CPP_PROJ) $(SOURCE) 1.14 +577 -577 apachen/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ApacheCore.mak1997/08/18 11:10:19 1.13 +++ ApacheCore.mak1997/08/23 04:00:18 1.14 @@ -101,7 +101,7 @@ $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /I .\core /D WIN32 /D\ +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /I .\main /D WIN32 /D\ NDEBUG /D _WINDOWS /Fp$(INTDIR)\ApacheCore.pch /YX /Fo$(INTDIR)\\\ /Fd$(INTDIR)\\ /FD /c CPP_OBJS=.\CoreR/ @@ -284,7 +284,7 @@ $(OUTDIR) : if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR) -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\core /D WIN32\ +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\main /D WIN32\ /D _DEBUG /D _WINDOWS /FR$(INTDIR)\\ /Fp$(INTDIR)\ApacheCore.pch /YX\ /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c CPP_OBJS=.\CoreD/ @@ -434,16 +434,16 @@ !IF $(CFG) == ApacheCore - Win32 Release || $(CFG) ==\ ApacheCore - Win32 Debug -SOURCE=.\core\alloc.c +SOURCE=.\main\alloc.c !IF $(CFG) == ApacheCore - Win32 Release DEP_CPP_ALLOC=\ - .\core\alloc.h\ - .\core\buff.h\ - .\core\conf.h\ - .\core\httpd.h\ - .\core\multithread.h\ + .\main\alloc.h\ + .\main\buff.h\ + .\main\conf.h\ + .\main\httpd.h\ + .\main\multithread.h\ .\os\win32\readdir.h\ .\regex\regex.h\ @@ -455,11 +455,11 @@ !ELSEIF $(CFG) == ApacheCore - Win32 Debug DEP_CPP_ALLOC=\ - .\core\alloc.h\ - .\core\buff.h\ - .\core\conf.h\ - .\core\httpd.h\ - .\core\multithread.h\ + .\main\alloc.h\ + .\main\buff.h\ + .\main\conf.h\ + .\main\httpd.h\ + .\main\multithread.h\ .\os\win32\readdir.h\ .\regex\regex.h\ @@ -471,16 +471,16 @@ !ENDIF -SOURCE=.\core\buff.c +SOURCE=.\main\buff.c !IF $(CFG) == ApacheCore - Win32 Release DEP_CPP_BUFF_=\ - .\core\alloc.h\ - .\core\buff.h\ - .\core\conf.h\ - .\core\http_main.h\ - .\core\httpd.h\ + .\main\alloc.h\ + .\main\buff.h\ + .\main\conf.h\ + .\main\http_main.h\ + .\main\httpd.h\ .\os\win32\readdir.h\ .\regex\regex.h\ @@ -492,11 +492,11 @@ !ELSEIF $(CFG) == ApacheCore - Win32 Debug DEP_CPP_BUFF_=\ - .\core\alloc.h\ - .\core\buff.h\ - .\core\conf.h\ - .\core\http_main.h\ - .\core\httpd.h\ + .\main\alloc.h\ + .\main\buff.h\ + .\main\conf.h\ + .\main\http_main.h\ + .\main\httpd.h\ .\os\win32\readdir.h\ .\regex\regex.h\ @@ -508,9 +508,9 @@ !ENDIF -SOURCE=.\core\explain.c +SOURCE=.\main\explain.c DEP_CPP_EXPLA=\ - .\core\explain.h\ + .\main\explain.h\ !IF $(CFG) == ApacheCore - Win32 Release @@ -530,9 +530,9 @@ !ENDIF -SOURCE=.\core\fnmatch.c +SOURCE=.\main\fnmatch.c DEP_CPP_FNMAT=\ - .\core\fnmatch.h\ + .\main\fnmatch.h\ !IF $(CFG) == ApacheCore - Win32 Release @@ -570,15 +570,15 @@ !ENDIF -SOURCE=.\core\http_bprintf.c +SOURCE=.\main\http_bprintf.c !IF $(CFG) == ApacheCore - Win32 Release DEP_CPP_HTTP_=\ - .\core\alloc.h\ - .\core\buff.h\ - .\core\conf.h\ - .\core\httpd.h\ + .\main\alloc.h\ + .\main\buff.h\ + .\main\conf.h\ + .\main\httpd.h\ .\os\win32\readdir.h\ .\regex\regex.h\ @@ -590,10 +590,10 @@ !ELSEIF $(CFG) == ApacheCore - Win32 Debug DEP_CPP_HTTP_=\ - .\core\alloc.h\ - .\core\buff.h\ - .\core\conf.h\ - .\core\httpd.h\ + .\main\alloc.h\ + .\main\buff.h\ + .\main
cvs commit: apachen/src Apache.dsp ApacheCore.dsp
randy 97/08/22 21:10:12 Modified:src Apache.dsp ApacheCore.dsp Log: Perhaps this is the last of the cleanups... Revision ChangesPath 1.4 +1 -1 apachen/src/Apache.dsp Index: Apache.dsp === RCS file: /export/home/cvs/apachen/src/Apache.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Apache.dsp1997/08/13 08:37:12 1.3 +++ Apache.dsp1997/08/23 04:10:08 1.4 @@ -85,7 +85,7 @@ # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90 # Begin Source File -SOURCE=.\core\dummy.c +SOURCE=.\main\dummy.c # End Source File # End Group # Begin Group Header Files 1.8 +40 -40apachen/src/ApacheCore.dsp Index: ApacheCore.dsp === RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheCore.dsp1997/08/18 11:10:19 1.7 +++ ApacheCore.dsp1997/08/23 04:10:09 1.8 @@ -44,7 +44,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 .\regex /I .\core /D WIN32 /D NDEBUG /D _WINDOWS /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I .\regex /I .\main /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 @@ -70,7 +70,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 .\regex /I .\core /D WIN32 /D _DEBUG /D _WINDOWS /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\main /D WIN32 /D _DEBUG /D _WINDOWS /FR /YX /FD /c # ADD BASE MTL /nologo /D _DEBUG /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d _DEBUG @@ -93,7 +93,7 @@ # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90 # Begin Source File -SOURCE=.\core\alloc.c +SOURCE=.\main\alloc.c # End Source File # Begin Source File @@ -101,15 +101,15 @@ # End Source File # Begin Source File -SOURCE=.\core\buff.c +SOURCE=.\main\buff.c # End Source File # Begin Source File -SOURCE=.\core\explain.c +SOURCE=.\main\explain.c # End Source File # Begin Source File -SOURCE=.\core\fnmatch.c +SOURCE=.\main\fnmatch.c # End Source File # Begin Source File @@ -117,35 +117,35 @@ # End Source File # Begin Source File -SOURCE=.\core\http_bprintf.c +SOURCE=.\main\http_bprintf.c # End Source File # Begin Source File -SOURCE=.\core\http_config.c +SOURCE=.\main\http_config.c # End Source File # Begin Source File -SOURCE=.\core\http_core.c +SOURCE=.\main\http_core.c # End Source File # Begin Source File -SOURCE=.\core\http_log.c +SOURCE=.\main\http_log.c # End Source File # Begin Source File -SOURCE=.\core\http_main.c +SOURCE=.\main\http_main.c # End Source File # Begin Source File -SOURCE=.\core\http_protocol.c +SOURCE=.\main\http_protocol.c # End Source File # Begin Source File -SOURCE=.\core\http_request.c +SOURCE=.\main\http_request.c # End Source File # Begin Source File -SOURCE=.\core\md5c.c +SOURCE=.\main\md5c.c # End Source File # Begin Source File @@ -233,7 +233,7 @@ # End Source File # Begin Source File -SOURCE=.\core\rfc1413.c +SOURCE=.\main\rfc1413.c # End Source File # Begin Source File @@ -241,23 +241,23 @@ # End Source File # Begin Source File -SOURCE=.\core\util.c +SOURCE=.\main\util.c # End Source File # Begin Source File -SOURCE=.\core\util_date.c +SOURCE=.\main\util_date.c # End Source File # Begin Source File -SOURCE=.\core\util_md5.c +SOURCE=.\main\util_md5.c # End Source File # Begin Source File -SOURCE=.\core\util_script.c +SOURCE=.\main\util_script.c # End Source File # Begin Source File -SOURCE=.\core\util_snprintf.c +SOURCE=.\main\util_snprintf.c # End Source File # Begin Source File @@ -269,23 +269,23 @@ # PROP Default_Filter h;hpp;hxx;hm;inl;fi;fd # Begin Source File -SOURCE=.\core\alloc.h +SOURCE=.\main\alloc.h # End Source File # Begin Source File -SOURCE=.\core\buff.h +SOURCE=.\main\buff.h # End Source File # Begin Source File -SOURCE=.\core\conf.h +SOURCE=.\main\conf.h # End Source File # Begin Source File -SOURCE=.\core\explain.h +SOURCE=.\main\explain.h # End Source File # Begin Source File -SOURCE=.\core\fnmatch.h +SOURCE=.\main\fnmatch.h
cvs commit: apachen/src CHANGES
randy 97/08/22 21:24:23 Modified:src CHANGES Log: (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. [These changes were accidentally commited with the core - main change] Submitted by: David J. MacKenzie [EMAIL PROTECTED] Reviewed by: Dean Gaudet, Brian Behlendorf, Randy Terbush Revision ChangesPath 1.411 +5 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.410 retrieving revision 1.411 diff -u -r1.410 -r1.411 --- CHANGES 1997/08/23 02:59:36 1.410 +++ CHANGES 1997/08/23 04:24:20 1.411 @@ -1,5 +1,10 @@ Changes with Apache 1.3a2 + *) (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. + [David J. MacKenzie] + *) If no TransferLog is given explicitly, decline to log. This supports coexistence with other logging modules, such as the custom one that UUNET uses. [David J. MacKenzie]
cvs commit: apache-site/mirrors index.html mirrors.list
randy 97/08/10 19:04:16 Modified:mirrors index.html mirrors.list Log: Add a few new mirror sites. Revision ChangesPath 1.14 +8 -0 apache-site/mirrors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- index.html1997/08/11 01:41:04 1.13 +++ index.html1997/08/11 02:04:13 1.14 @@ -85,6 +85,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://apache.iit.uni-miskolc.hu/;hu/A - !-- [EMAIL PROTECTED] -- +A HREF=http://apache.ub.net.id/;id/A - +!-- [EMAIL PROTECTED] -- A HREF=http://apache.koala.ie/;ie/A - !-- [EMAIL PROTECTED] -- A HREF=http://apache.csn.ul.ie;ie/A - @@ -207,6 +209,10 @@ !-- [EMAIL PROTECTED] -- A HREF=http://apache.mpl.net/;us/A - !-- [EMAIL PROTECTED] -- +A HREF=http://apache.plinet.com/;us/A - +!-- [EMAIL PROTECTED] -- +A HREF=http://www.fon.bg.ac.yu/mirror/apache/;yu/A - +!-- [EMAIL PROTECTED] -- A HREF=http://www.is.co.za/resources/ftpsite/apache/;za/A - !-- [EMAIL PROTECTED] -- /STRONG @@ -269,6 +275,8 @@ A HREF=ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/;hr/A - !-- -- A HREF=ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/;hu/A - +!-- -- +A HREF=ftp://apache.ub.net.id/pub/apache/;id/A - !-- -- A HREF=ftp://apache.koala.ie/pub/apache/dist/;ie/A - !-- -- 1.27 +5 -0 apache-site/mirrors/mirrors.list Index: mirrors.list === RCS file: /export/home/cvs/apache-site/mirrors/mirrors.list,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mirrors.list 1997/08/11 01:41:06 1.26 +++ mirrors.list 1997/08/11 02:04:14 1.27 @@ -29,6 +29,7 @@ http hu http://foobar.szabinet.hu/apache/ [EMAIL PROTECTED] http hu http://xenia.sote.hu/ftp/linux/mirrors/www.apache.org/ [EMAIL PROTECTED] http hu http://apache.iit.uni-miskolc.hu/ [EMAIL PROTECTED] +http id http://apache.ub.net.id/[EMAIL PROTECTED] http ie http://apache.koala.ie/ [EMAIL PROTECTED] http ie http://apache.csn.ul.ie [EMAIL PROTECTED] http il http://vipe.technion.ac.il/apache/ [EMAIL PROTECTED] @@ -70,6 +71,7 @@ http tr http://apache.bilkent.edu.tr/ [EMAIL PROTECTED] http tw http://www.uuserv.net.tw/apache/[EMAIL PROTECTED] http tw http://www.me.ncu.edu.tw/apache/[EMAIL PROTECTED] +http:tw http://apache.ficnet.net.tw/[EMAIL PROTECTED] http ua http://www.neon.dp.ua/www.apache.org/ [EMAIL PROTECTED] http ua http://ftp.icmp.lviv.ua/Apache/ [EMAIL PROTECTED] http ua http://www.apache.carrier.kiev.ua/ [EMAIL PROTECTED] @@ -90,6 +92,8 @@ http us http://www.ameth.org/apache/[EMAIL PROTECTED] http us http://apache.technomancer.com/ [EMAIL PROTECTED] http us http://apache.mpl.net/ [EMAIL PROTECTED] +http us http://apache.plinet.com/ [EMAIL PROTECTED] +http yu http://www.fon.bg.ac.yu/mirror/apache/ [EMAIL PROTECTED] http za http://www.is.co.za/resources/ftpsite/apache/ [EMAIL PROTECTED] ftp ar ftp://ftp.infoap.com.ar/pub/apache/dist/ ftp at ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/ @@ -119,6 +123,7 @@ ftp hk ftp://ftp.hk.super.net/mirror/apache/dist/ [EMAIL PROTECTED] ftp hr ftp://sunsite.srce.hr/mirrors/ftp.apache.org/apache/ ftp hu ftp://xenia.sote.hu/pub/linux/mirrors/www.apache.org/dist/ +ftp id ftp://apache.ub.net.id/pub/apache/ ftp ie ftp://apache.koala.ie/pub/apache/dist/ ftp il ftp://ftp.rifkin.technion.ac.il/pub/apache/ ftp il ftp://apache.linux.org.il/pub/linux/apache/dist/
