cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/17 00:36:12
Modified:.Makefile.tmpl
Log:
Only whitespace cosmetics and cleanups:
- consistently replace leading whitespaces with tabs to make
the file correctly indented both with tabs=4 and tabs=8
- remove trailing whitespaces on lines to make every Make happy
Revision ChangesPath
1.19 +58 -58apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.tmpl 1998/04/16 06:47:12 1.18
+++ Makefile.tmpl 1998/04/17 07:36:12 1.19
@@ -6,7 +6,7 @@
## are met:
##
## 1. Redistributions of source code must retain the above copyright
-##notice, this list of conditions and the following disclaimer.
+##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
@@ -63,7 +63,7 @@
##
## ==
-## Options
+## Options
## ==
# safe environment
@@ -126,7 +126,7 @@
setenvif_module
## ==
-## Targets
+## Targets
## ==
# default target
@@ -137,7 +137,7 @@
## --
# build the package
-build:
+build:
@echo === $(SRC)
@$(MAKE) -f $(MKF) $(MFLAGS) build-std $(build-support)
@touch $(SRC)/.apaci.build.ok
@@ -159,7 +159,7 @@
echo === $(SRC)/support
## --
-## Installation Targets
+## Installation Targets
## --
# the install target for installing the complete Apache
@@ -170,28 +170,28 @@
$(MAKE) -f $(MKF) $(MFLAGS) build; \
fi
@$(MAKE) -f $(MKF) $(MFLAGS) \
- install-mktree install-programs $(install-support) \
+ install-mktree install-programs $(install-support) \
install-include install-docroot install-config
[EMAIL PROTECTED] -f .install.tmp
[EMAIL PROTECTED] -f .install.conf
[EMAIL PROTECTED] [ .$(QUIET) != .1 ]; then \
- echo ++; \
- echo | You now have successfully built and installed the |; \
- echo | Apache 1.3 HTTP server. To verify that Apache actually |; \
- echo | works correctly you can immediately try to fire it up |; \
- echo | the first time by running: |; \
- echo ||; \
- echo | $(sbindir)/apachectl start; \
- echo ||; \
- echo | Then you should additionally adjust the configuration |; \
- echo | files which can be found under the following paths:|; \
- echo ||; \
- echo | $(sysconfdir)/{httpd,access,srm}.conf; \
- echo ||; \
- echo | Thanks for running Apache. |; \
- echo |The Apache Group|; \
- echo |http://www.apache.org/ |; \
- echo ++; \
+ echo
++; \
+ echo | You now have successfully built and installed the
|; \
+ echo | Apache 1.3 HTTP server. To verify that Apache actually
|; \
+ echo | works correctly you can immediately try to fire it up
|; \
+ echo | the first time by running:
|; \
+ echo |
|; \
+ echo | $(sbindir)/apachectl start; \
+ echo |
|; \
+ echo | Then you should additionally adjust the configuration
|; \
+ echo | files which can be found under the following paths:
|; \
+ echo |
cvs commit: apache-devsite how-to-release-win32.html
pcs 98/04/17 08:50:25
Modified:.how-to-release-win32.html
Log:
Update the IS2 documentation for Windows slightly
Revision ChangesPath
1.4 +16 -2 apache-devsite/how-to-release-win32.html
Index: how-to-release-win32.html
===
RCS file: /export/home/cvs/apache-devsite/how-to-release-win32.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- how-to-release-win32.html 1998/04/06 17:21:39 1.3
+++ how-to-release-win32.html 1998/04/17 15:50:16 1.4
@@ -80,8 +80,14 @@
LISAMPsrc\os\{emx,bs2000,unix}/SAMP
LISAMPsrc\helpers/SAMP
LISAMPsrc\test/SAMP
+ LISAMPsrc\modules\test/SAMP
/UL
+(Note: the InstallShield configuration file lists only the files which
+are to be build into the installer, so it is no necessary to remove
+these files and directories unless you are planning to update the IS
+configuration by dragging-and-dropping directories).
+
P
Copy the SAMPMSVCRT.DLL/SAMP file into the install directory. This
@@ -147,7 +153,7 @@
The installer DLL is called by the installation process to configure
the sample configuration files. It is built by running SAMPnmake -f
-Makefile.nt install.mak/SAMP in the SAMPsrc/SAMP directory (is
+Makefile.nt installdll/SAMP in the SAMPsrc/SAMP directory (is
it not built by the normal SAMP_apacheX/SAMP or
SAMPinstallX/SAMP targets). The code for the installer is in
SAMPos/win32/installer/installdll/SAMP, and after doing the build
@@ -178,16 +184,24 @@
| Apache.exe
| ApacheCore.dll
| CHANGES
+ | CHANGES.APACI
+ | configure
+ | HTTP_Features.tsv
+ | INSTALL
| install.dll
| KEYS
| LICENSE
| Makefile
+ | Makefile.tmpl
| MSVCRT.DLL
| README
+ | README.configure
| README.NT
+ | STATUS
|
|--- conf
| access.conf-dist-win
+ | highperformance.conf-dist
| httpd.conf-dist-win
| magic
| mime.types
@@ -259,7 +273,7 @@
The single file installer is now built and ready to run. It will be
called SAMPSETUPEX.EXE/SAMP. Rename this to an appropriate name
-for Windows, such as SAMPAPACHE_1_3B5.EXE/SAMP (there must only be
+for Windows, such as SAMPAPACHE_1_3B6.EXE/SAMP (there must only be
one period in the name).
/OL
cvs commit: apache-1.3/src/os/win32/installer apache.iwz
pcs 98/04/17 09:01:44 Modified:src/os/win32/installer apache.iwz Log: Remove modules/test from the IS2 build. Add in a few new top-level files like Announcement that were missing. (But not everything: *.APACI files are not packaged for Win32 since they have no meaning on that platform). Revision ChangesPath 1.3 +212 -220 apache-1.3/src/os/win32/installer/apache.iwz Index: apache.iwz === RCS file: /export/home/cvs/apache-1.3/src/os/win32/installer/apache.iwz,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apache.iwz1998/04/17 15:28:39 1.2 +++ apache.iwz1998/04/17 16:01:44 1.3 @@ -36,7 +36,6 @@ Version=2.0 DevTool=Generic Windows Platform=Win32 -DisksBuilt=1 DisksDir=apache\650MB\ TabsVisit=0011100011 LangNum=451 @@ -75,11 +74,11 @@ Component1Groups=5 Component1Name=Application Files Component1Description=Application files needed to run the application -Component1GroupList=1 3 25 26 27 -Component2Groups=15 +Component1GroupList=1 3 24 25 26 +Component2Groups=14 Component2Name=Source Code Component2Description=Source code for Apache and support tools -Component2GroupList=10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +Component2GroupList=10 11 12 13 14 15 16 17 18 19 20 21 22 23 Component3Groups=6 Component3Name=Documentation Component3Description=Apache documentation @@ -91,12 +90,12 @@ Component5Groups=1 Component5Name=Icons Component5Description=Icons for directory indexes -Component5GroupList=28 +Component5GroupList=27 [Groups] -Groups=28 -Group1Size=305564 -Group1Files=10 +Groups=27 +Group1Size=334031 +Group1Files=12 Group1Name=Program Executables Group1Dir=INSTALLDIR Group1Update=0 @@ -110,6 +109,8 @@ Group1File8=C:\Apache\Makefile Group1File9=C:\Apache\README Group1File10=C:\Apache\README.NT +Group1File11=C:\apache\Makefile.tmpl +Group1File12=C:\apache\STATUS Group2Size=96768 Group2Files=9 Group2Name=Additional Modules @@ -470,227 +471,218 @@ Group19File35=C:\apache\src\modules\standard\mod_unique_id.c Group19File36=C:\apache\src\modules\standard\mod_userdir.c Group19File37=C:\apache\src\modules\standard\mod_usertrack.c -Group20Size=19160 -Group20Files=4 -Group20Name=test -Group20Dir=[modules]\test +Group20Size=170120 +Group20Files=25 +Group20Name=regex +Group20Dir=[src]\regex Group20Update=0 -Group20File1=C:\Apache\src\modules\test\Makefile.tmpl -Group20File2=C:\Apache\src\modules\test\mod_rndchunk.c -Group20File3=C:\Apache\src\modules\test\README -Group20File4=C:\apache\src\modules\test\mod_test_util_uri.c -Group21Size=170120 -Group21Files=25 -Group21Name=regex -Group21Dir=[src]\regex +Group20File1=C:\Apache\src\regex\cclass.h +Group20File2=C:\Apache\src\regex\cname.h +Group20File3=C:\Apache\src\regex\COPYRIGHT +Group20File4=C:\Apache\src\regex\debug.c +Group20File5=C:\Apache\src\regex\engine.c +Group20File6=C:\Apache\src\regex\engine.ih +Group20File7=C:\Apache\src\regex\main.c +Group20File8=C:\Apache\src\regex\Makefile.tmpl +Group20File9=C:\Apache\src\regex\mkh +Group20File10=C:\Apache\src\regex\README +Group20File11=C:\Apache\src\regex\regcomp.c +Group20File12=C:\Apache\src\regex\regcomp.ih +Group20File13=C:\Apache\src\regex\regerror.c +Group20File14=C:\Apache\src\regex\regerror.ih +Group20File15=C:\Apache\src\regex\regex.3 +Group20File16=C:\Apache\src\regex\regex.7 +Group20File17=C:\Apache\src\regex\regex.dsp +Group20File18=C:\Apache\src\regex\regex.mak +Group20File19=C:\Apache\src\regex\regex2.h +Group20File20=C:\Apache\src\regex\regexec.c +Group20File21=C:\Apache\src\regex\regfree.c +Group20File22=C:\Apache\src\regex\split.c +Group20File23=C:\Apache\src\regex\tests +Group20File24=C:\Apache\src\regex\utils.h +Group20File25=C:\Apache\src\regex\WHATSNEW +Group21Size=168008 +Group21Files=26 +Group21Name=support +Group21Dir=[src]\support Group21Update=0 -Group21File1=C:\Apache\src\regex\cclass.h -Group21File2=C:\Apache\src\regex\cname.h -Group21File3=C:\Apache\src\regex\COPYRIGHT -Group21File4=C:\Apache\src\regex\debug.c -Group21File5=C:\Apache\src\regex\engine.c -Group21File6=C:\Apache\src\regex\engine.ih -Group21File7=C:\Apache\src\regex\main.c -Group21File8=C:\Apache\src\regex\Makefile.tmpl -Group21File9=C:\Apache\src\regex\mkh -Group21File10=C:\Apache\src\regex\README -Group21File11=C:\Apache\src\regex\regcomp.c -Group21File12=C:\Apache\src\regex\regcomp.ih -Group21File13=C:\Apache\src\regex\regerror.c -Group21File14=C:\Apache\src\regex\regerror.ih -Group21File15=C:\Apache\src\regex\regex.3 -Group21File16=C:\Apache\src\regex\regex.7 -Group21File17=C:\Apache\src\regex\regex.dsp -Group21File18=C:\Apache\src\regex\regex.mak
cvs commit: apache-1.3/src CHANGES Configure
rse 98/04/17 11:49:38
Modified:.STATUS
src CHANGES Configure
Log:
Make sure some AWK's don't fail in src/Configure with string too long errors
when generating the MODULES entry for src/Makefile
Submitted by: Ralf S. Engelschall
Reviewed by: Ben Hyde, Ralf S. Engelschall
Revision ChangesPath
1.300 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- STATUS1998/04/16 17:30:45 1.299
+++ STATUS1998/04/17 18:49:34 1.300
@@ -58,6 +58,7 @@
Committed Code Changes:
* Lars' Configure fix to avoid confusing message under APACI control
+* Ralf's Configure fix for AWK's failing with string to long error
Available Patches:
1.771 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- CHANGES 1998/04/16 17:30:46 1.770
+++ CHANGES 1998/04/17 18:49:35 1.771
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) PORT: Make sure some AWK's don't fail in src/Configure with string too
+ long errors when generating the MODULES entry for src/Makefile
+ [Ben Hyde, Ralf S. Engelschall]
+
*) Make sure src/Configure doesn't complain about the old directory
/usr/local/etc/httpd/ when APACI is used. [Lars Eilebrecht]
1.240 +4 -6 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- Configure 1998/04/16 17:30:47 1.239
+++ Configure 1998/04/17 18:49:36 1.240
@@ -1362,12 +1362,10 @@
## Now add the auto-generated library targets. Need to use awk so we
## don't hang a continuation on the last line.
##
-$CAT $awkfile EOF3
-BEGIN {
- split ($AUTOLIBS, libs)
-EOF3
-$CAT $awkfile 'EOF4'
+$CAT $awkfile 'EOF4'
+{
z = 0
+ split ($0, libs)
for ( lib in libs ) {
if (z != 0)
printf ( \\\n)
@@ -1379,7 +1377,7 @@
printf (\n)
}
EOF4
-awk -f $awkfile Makefile /dev/null
+echo $AUTOLIBS | awk -f $awkfile Makefile
echo Makefile
cvs commit: apache-1.3/src/test tcpdumpscii.txt
dgaudet 98/04/17 15:11:57
Added: src/test tcpdumpscii.txt
Log:
script for decoding ascii in tcpdump output
Revision ChangesPath
1.1 apache-1.3/src/test/tcpdumpscii.txt
Index: tcpdumpscii.txt
===
From [EMAIL PROTECTED] Fri Apr 17 15:16:16 1998
Date: Sat, 22 Nov 1997 20:44:10 -0700 (MST)
From: Marc Slemko [EMAIL PROTECTED]
To: TLOSAP new-httpd@apache.org
Subject: Re: Getting ethernet packets content under FreeBSD? (fwd)
Reply-To: new-httpd@apache.org
Anyone too lazy to hack tcpdump (eg. my tcpdump has a -X option to display
the data in ASCII) can use something like the below to grab HTTP headers
when debugging broken clients.
Nothing complicated, but handy.
-- Forwarded message --
Date: Sat, 22 Nov 1997 14:35:23 PST
From: Bill Fenner [EMAIL PROTECTED]
To: Nate Williams [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED], [EMAIL PROTECTED]
Subject: Re: Getting ethernet packets content under FreeBSD?
I usually just use this perl script, which I call tcpdumpscii.
Then run tcpdumpscii -s 1500 -x [other tcpdump args].
Bill
#!/import/misc/bin/perl
#
#
open(TCPDUMP,tcpdump -l @ARGV|);
while (TCPDUMP) {
if (/^\s+(\S\S)+/) {
$sav = $_;
$asc = ;
while (s/\s*(\S\S)\s*//) {
$i = hex($1);
if ($i 32 || $i 126) {
$asc .= .;
} else {
$asc .= pack(C,hex($1));
}
}
$foo = . x length($asc);
$_ = $sav;
s/\t//g;
s/^$foo/$asc/;
}
print;
}
