cvs commit: apachen STATUS
dgaudet 97/12/20 16:05:21 Modified:.STATUS Log: yadda Revision ChangesPath 1.8 +8 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- STATUS1997/12/20 23:55:35 1.7 +++ STATUS1997/12/21 00:05:20 1.8 @@ -46,6 +46,14 @@ Available: +* Igor Tatarinov's Re: A tiny correction and a question on writev_it_all + [EMAIL PROTECTED] + Status: Dean +1 + +* Dean's [PATCH] util_date.c needless reinitialization + [EMAIL PROTECTED] + Status: Dean +1 + * Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs [EMAIL PROTECTED] Status: Dean +1
cvs commit: apachen/src/test .cvsignore
dgaudet 97/12/20 16:15:21 Added: src/test .cvsignore Log: be quiet cvs Revision ChangesPath 1.1 apachen/src/test/.cvsignore Index: .cvsignore === a.out time-FCNTL time-FLOCK time-SYSVSEM time-SYSVSEM2 time-PTHREAD time-USLOCK zb test-writev test_date test_select
cvs commit: apachen/logs .cvsignore
dgaudet 97/12/20 16:20:21 Modified:logs .cvsignore Log: Don't warn about anything here... there shouldn't be anything checked into cvs anyway. Revision ChangesPath 1.2 +1 -3 apachen/logs/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/logs/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1997/08/25 02:34:59 1.1 +++ .cvsignore1997/12/21 00:20:20 1.2 @@ -1,3 +1 @@ -access_log -error_log -httpd.pid +*
cvs commit: apachen/htdocs .cvsignore
dgaudet 97/12/20 16:22:00 Added: htdocs .cvsignore Log: I'm tired of cvs complaining about all my debugging files. We're not likely to be changing this directory much, so ignore any non-cvs files in it. Revision ChangesPath 1.1 apachen/htdocs/.cvsignore Index: .cvsignore === *
cvs commit: apachen/src/main http_main.c
jim 97/12/20 17:54:40
Modified:.STATUS
src/main http_main.c
Log:
Submitted by: Dean Gaudet
Reviewed by: Jim Jagielski
This patch worked for me, and I was the one who complained :)
Revision ChangesPath
1.10 +1 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- STATUS1997/12/21 01:51:53 1.9
+++ STATUS1997/12/21 01:54:37 1.10
@@ -43,6 +43,7 @@
* Ken's stage 2 of moving ap_*() to src/ap (ap_slack() move)
* Brian Havard's [PATCH] mod_mime_magic and OS/2
* Igor Tatarinov's [PATCH] usage patch (-V)
+* Dean's [PATCH] child_timeout not correctly defined
Available:
@@ -73,10 +74,6 @@
* Dean's [PATCH] mod_status cleanups
[EMAIL PROTECTED]
Status: Dean +1, Jim +1
-
-* Dean's [PATCH] child_timeout not correctly defined
- [EMAIL PROTECTED]
- Status: Jim +1, Dean +1
* Dean's [PATCH] mod_info minor cleanups (take 2)
[EMAIL PROTECTED]
1.258 +2 -2 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.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- http_main.c 1997/12/20 23:54:43 1.257
+++ http_main.c 1997/12/21 01:54:39 1.258
@@ -224,7 +224,7 @@
int one_process = 0;
/* set if timeouts are to be handled by the children and not by the parent.
- * i.e. child_timeouts = standalone || one_process.
+ * i.e. child_timeouts = !standalone || one_process.
*/
static int child_timeouts;
@@ -3558,7 +3558,7 @@
suexec_enabled = init_suexec();
server_conf = read_config(pconf, ptrans, server_confname);
-child_timeouts = standalone || one_process;
+child_timeouts = !standalone || one_process;
if (standalone) {
open_logs(server_conf, pconf);
cvs commit: apachen/src/modules/standard mod_usertrack.c
jim 97/12/20 17:58:57
Modified:.STATUS
src Configure
src/main conf.h
src/modules/standard mod_usertrack.c
Log:
Obtained from: Mark Bixby
Submitted by: Jim Jagielski
Reviewed by: Jim Jagielski, Dean Gaudet
Updates required for the MPR port; biggest issue is that MPE's
internal 'cat' is braindead, so we need to be able to force
/bin/cat for Configure.
Revision ChangesPath
1.11 +1 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- STATUS1997/12/21 01:54:37 1.10
+++ STATUS1997/12/21 01:58:46 1.11
@@ -44,6 +44,7 @@
* Brian Havard's [PATCH] mod_mime_magic and OS/2
* Igor Tatarinov's [PATCH] usage patch (-V)
* Dean's [PATCH] child_timeout not correctly defined
+* Mark Bixby's [PORT] MPE porting patch
Available:
@@ -66,10 +67,6 @@
* Dean's [PATCH] fix Rasmus' chunking error
[EMAIL PROTECTED]
Status: Dean +1
-
-* Mark Bixby's [PORT] MPE porting patch
- [EMAIL PROTECTED]
- Status: Jim +1, Dean +1
* Dean's [PATCH] mod_status cleanups
[EMAIL PROTECTED]
1.175 +17 -15apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- Configure 1997/12/01 16:51:48 1.174
+++ Configure 1997/12/21 01:58:53 1.175
@@ -165,6 +165,7 @@
SHELL=/bin/sh
TARGET=httpd
PRINTPATH=PrintPath
+CAT=cat
if ./helpers/$PRINTPATH -s ranlib; then
RANLIB=ranlib
@@ -202,8 +203,9 @@
*MPE/iX*)
OS='MPE/iX'
CFLAGS=$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE
- LIBS=$LIBS -lsocket
+ LIBS=$LIBS -lsocket -lsvipc
LDFLAGS=$LDFLAGS -Xlinker \-WL,cap=ia,ba,ph,pm;nmstack=1024000\
+ CAT=/bin/cat # built-in cat is badly broken for stdin redirection
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
@@ -814,7 +816,7 @@
#echo bas=$modbase ext=$ext
if [ -r $modbase.module ] ; then
- cat $modbase.module $tmpfile2
+ $CAT $modbase.module $tmpfile2
else
if [ -f $modbase.c ] ; then
# Guess module structure name in case there is not
@@ -824,7 +826,7 @@
sed 's/[]*;[]*$//'`
# Get any module definition part
if grep MODULE-DEFINITION- $modbase.c /dev/null; then
- cat $modbase.c | \
+ $CAT $modbase.c | \
sed '1,/MODULE-DEFINITION-START/d;/MODULE-DEFINITION-END/,$d' \
$tmpfile2
fi
@@ -922,11 +924,11 @@
# Add the module targets to the Makefile. Do not add individual object
# targets for auto-generated directories.
-cat $awkfile EOF1
+$CAT $awkfile EOF1
BEGIN {
split ($AUTODIRS, tmp, )
EOF1
-cat $awkfile 'EOF2'
+$CAT $awkfile 'EOF2'
for ( key in tmp ) {
autodirs[tmp[key]] = 1
}
@@ -955,11 +957,11 @@
# 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
+$CAT $awkfile EOF3
BEGIN {
split ($AUTOLIBS, libs)
EOF3
-cat $awkfile 'EOF4'
+$CAT $awkfile 'EOF4'
z = 0
for ( lib in libs ) {
if (z != 0)
@@ -1027,7 +1029,7 @@
#
# ./Makefile
#
-cat Makefile.config Makefile
+$CAT Makefile.config Makefile
sed -e s#@@Configuration@@#$file# Makefile.tmpl Makefile
#
@@ -1036,12 +1038,12 @@
MAKEDIRS=support main ap regex $OSDIR
for dir in $MAKEDIRS ; do
echo Creating Makefile in $dir
- cat Makefile.config $dir/Makefile.tmpl $dir/Makefile
+ $CAT Makefile.config $dir/Makefile.tmpl $dir/Makefile
done
-cat Makefile.config modules/Makefile
+$CAT Makefile.config modules/Makefile
-cat EOF modules/Makefile
+$CAT EOF modules/Makefile
MODULES=$MODDIRS
CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS)
@@ -1055,8 +1057,8 @@
for moddir in $AUTODIRS ; do
echo Creating Makefile in $moddir
- cat Makefile.config $moddir/Makefile
- cat 'EOF' $moddir/Makefile
+ $CAT Makefile.config $moddir/Makefile
+ $CAT 'EOF' $moddir/Makefile
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
@@ -1081,7 +1083,7 @@
}'
echo LIB=lib$basedir.a $moddir/Makefile
- cat 'EOF' $moddir/Makefile
+ $CAT
cvs commit: apachen STATUS
brian 97/12/20 21:31:43 Modified:.STATUS Log: Revision ChangesPath 1.12 +2 -2 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- STATUS1997/12/21 01:58:46 1.11 +++ STATUS1997/12/21 05:31:42 1.12 @@ -74,7 +74,7 @@ * Dean's [PATCH] mod_info minor cleanups (take 2) [EMAIL PROTECTED] - Status: Dean +1 + Status: Dean +1, Brian +1 * Martin's [PATCH] 36kB: Make apache compile run on an EBCDIC mainframe [EMAIL PROTECTED] @@ -82,7 +82,7 @@ * Dean's [PATCH] Re: problem with a .gif and v2.1.4 [EMAIL PROTECTED] - Status: Dean +1, Jim +1 + Status: Dean +1, Jim +1, Brian +1 * Martin's [PATCH] Gimme a break! [EMAIL PROTECTED]
cvs commit: apachen/src/main http_protocol.c
dgaudet 97/12/21 00:18:17 Modified:.STATUS htdocs/manual/misc known_client_problems.html src CHANGES src/main http_protocol.c Log: Tweak the 257th byte bug... happens at the 256th byte as well. Reviewed by: Jim Jagielski, Brian Behlendorf Revision ChangesPath 1.13 +1 -4 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- STATUS1997/12/21 05:31:42 1.12 +++ STATUS1997/12/21 08:18:12 1.13 @@ -45,6 +45,7 @@ * Igor Tatarinov's [PATCH] usage patch (-V) * Dean's [PATCH] child_timeout not correctly defined * Mark Bixby's [PORT] MPE porting patch +* Dean's [PATCH] Re: problem with a .gif and v2.1.4 Available: @@ -79,10 +80,6 @@ * Martin's [PATCH] 36kB: Make apache compile run on an EBCDIC mainframe [EMAIL PROTECTED] Status: Martin +1, Dean +1 - -* Dean's [PATCH] Re: problem with a .gif and v2.1.4 - [EMAIL PROTECTED] - Status: Dean +1, Jim +1, Brian +1 * Martin's [PATCH] Gimme a break! [EMAIL PROTECTED] 1.4 +2 -2 apachen/htdocs/manual/misc/known_client_problems.html Index: known_client_problems.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/known_client_problems.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- known_client_problems.html1997/07/22 08:51:02 1.3 +++ known_client_problems.html1997/12/21 08:18:13 1.4 @@ -129,11 +129,11 @@ pAll versions of Navigator from 2.0 through 4.0b2 (and possibly later) have a problem if the trailing CRLF of the response header starts at -the 256th or 257th byte of the response. A BrowserMatch for this would +offset 256, 257 or 258 of the response. A BrowserMatch for this would match on nearly every hit, so the workaround is enabled automatically on all responses. The workaround is to detect when this condition would occur in a response and add extra padding to the header to push the -trailing CRLF past the 257th byte of the response. +trailing CRLF past offset 258 of the response. a name=boundary-stringh3Multipart responses and Quoted Boundary Strings/h3/a 1.535 +5 -1 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.534 retrieving revision 1.535 diff -u -r1.534 -r1.535 --- CHANGES 1997/12/20 23:51:03 1.534 +++ CHANGES 1997/12/21 08:18:14 1.535 @@ -1,5 +1,9 @@ Changes with Apache 1.3b4 - + + *) It appears the 257th byte bug (see + htdocs/manual/misc/known_client_problems.html#257th-byte) can happen + at the 256th byte as well. Fixed. [Dean Gaudet] + *) Fix mod_mime_magic under OS/2, no support for block devices. [Brian Havard] 1.171 +2 -2 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.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- http_protocol.c 1997/12/20 23:44:30 1.170 +++ http_protocol.c 1997/12/21 08:18:16 1.171 @@ -1092,7 +1092,7 @@ /* Navigator versions 2.x, 3.x and 4.0 betas up to and including 4.0b2 * have a header parsing bug. If the terminating \r\n occur starting - * at the 256th or 257th byte of output then it will not properly parse + * at offset 256, 257 or 258 of output then it will not properly parse * the headers. Curiously it doesn't exhibit this problem at 512, 513. * We are guessing that this is because their initial read of a new request * uses a 256 byte buffer, and subsequent reads use a larger buffer. @@ -1112,7 +1112,7 @@ long int bs; bgetopt(client, BO_BYTECT, bs); -if (bs == 256 || bs == 257) +if (bs = 255 bs = 257) bputs(X-Pad: avoid browser bug\015\012, client); bputs(\015\012, client); /* Send the terminating empty line */
