cvs commit: apache/src CHANGES http_main.c
fielding97/02/15 04:26:21
Modified:src CHANGES http_main.c
Log:
Replace sock_disable_nagle with a NOOP if the compiler doesn't
understand the TCP_NODELAY option.
Submitted by: Roy Fielding, based on Marc Slemko's patch
Revision ChangesPath
1.160 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.159
retrieving revision 1.160
diff -C3 -r1.159 -r1.160
*** CHANGES 1997/02/11 17:02:03 1.159
--- CHANGES 1997/02/15 12:26:19 1.160
***
*** 1,5
--- 1,8
Changes with Apache 1.2b7
+ *) Don't disable Nagle algorithm if system doesn't have TCP_NODELAY.
+ [Marc Slemko and Roy Fielding]
+
*) Fixed problem with mod_cgi-generated internal redirects trying to
read the request message-body twice. [Archie Cobbs and Roy Fielding]
1.120 +9 -10 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -C3 -r1.119 -r1.120
*** http_main.c 1997/02/11 15:55:20 1.119
--- http_main.c 1997/02/15 12:26:20 1.120
***
*** 1493,1520
return conn;
}
! void sock_disable_nagle (int s)
{
! /*
! * The Nagle algorithm says that we should delay sending partial
* packets in hopes of getting more data. We don't want to do
* this; we are not telnet. There are bad interactions between
* P-HTTP and Nagle's algorithm that have very severe performance
* penalties. (Failing to do disable Nagle is not much of a
! * problem with simple HTTP.) A better description of these
! * problems is in preparation; contact me for details.
! * -John Heidemann [EMAIL PROTECTED].
*
* In spite of these problems, failure here is not a shooting offense.
*/
const int just_say_no = 1;
! #ifndef MPE
! /* MPE does not support TCP_NODELAY */
if (0 != setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)just_say_no,
! sizeof(just_say_no)))
fprintf(stderr, httpd: could not set socket option TCP_NODELAY\n);
- #endif
}
/*
* Child process main loop.
--- 1493,1519
return conn;
}
! #if defined(TCP_NODELAY)
! static void sock_disable_nagle (int s)
{
! /* The Nagle algorithm says that we should delay sending partial
* packets in hopes of getting more data. We don't want to do
* this; we are not telnet. There are bad interactions between
* P-HTTP and Nagle's algorithm that have very severe performance
* penalties. (Failing to do disable Nagle is not much of a
! * problem with simple HTTP.)
*
* In spite of these problems, failure here is not a shooting offense.
*/
const int just_say_no = 1;
!
if (0 != setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)just_say_no,
! sizeof just_say_no))
fprintf(stderr, httpd: could not set socket option TCP_NODELAY\n);
}
+ #else
+ #define sock_disable_nagle(s) /* NOOP */
+ #endif
/*
* Child process main loop.
cvs commit: apache/src buff.c
ben 97/02/15 10:34:28 Modified:src buff.c Log: Fix warning. Revision ChangesPath 1.19 +2 -1 apache/src/buff.c Index: buff.c === RCS file: /export/home/cvs/apache/src/buff.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** buff.c1997/02/10 21:22:19 1.18 --- buff.c1997/02/15 18:34:27 1.19 *** *** 239,245 } /* we know this will fit because of how we wrote it in start_chunk() */ ! i = ap_snprintf( fb-outbase[fb-outchunk], fb-outchunk_header_size, %x, fb-outcnt - fb-outchunk - fb-outchunk_header_size ); /* we may have to tack some trailing spaces onto the number we just wrote --- 239,246 } /* we know this will fit because of how we wrote it in start_chunk() */ ! i = ap_snprintf( (char *)fb-outbase[fb-outchunk], ! fb-outchunk_header_size, %x, fb-outcnt - fb-outchunk - fb-outchunk_header_size ); /* we may have to tack some trailing spaces onto the number we just wrote
cvs commit: apache/src Configure
jim 97/02/15 13:54:32 Modified:src Configure Log: Revision ChangesPath 1.79 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.78 retrieving revision 1.79 diff -C3 -r1.78 -r1.79 *** Configure 1997/02/11 13:22:04 1.78 --- Configure 1997/02/15 21:54:31 1.79 *** *** 194,199 --- 194,200 *-dg-dgux*) OS='DG/UX 5.4' CFLAGS=$CFLAGS -DDGUX + DEF_WANTHSREGEX=yes ;; *OS/2*) DEF_WANTHSREGEX=yes
cvs commit: apache/htdocs/manual/mod directives.html mod_auth_anon.html mod_auth_msql.html mod_log_config.html
marc97/02/15 14:28:00 Modified:htdocs/manual/mod directives.html mod_auth_anon.html mod_auth_msql.html mod_log_config.html Log: Fix spelling of 'authorative' to 'authoritative' and typo in mod_log_config. Submitted by: Hubert Lin [EMAIL PROTECTED] Revision ChangesPath 1.14 +1 -1 apache/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/directives.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C3 -r1.13 -r1.14 *** directives.html 1997/02/07 09:14:17 1.13 --- directives.html 1997/02/15 22:27:57 1.14 *** *** 29,35 liA HREF=mod_auth_anon.html#LogEmailAnonymous_LogEmail/A liA HREF=mod_auth_anon.html#VerifyEmailAnonymous_VerifyEmail/A liA HREF=mod_auth_anon.html#NoUserAnonymous_NoUser/A ! liA HREF=mod_auth_anon.html#AuthorativeAnonymous_Authorative/A liA HREF=mod_auth.html#authauthoritativeAuthAuthoritative/A liA HREF=mod_auth_db.html#authdbauthoritativeAuthDBAuthoritative/A liA HREF=mod_auth_db.html#authdbgroupfileAuthDBGroupFile/A --- 29,35 liA HREF=mod_auth_anon.html#LogEmailAnonymous_LogEmail/A liA HREF=mod_auth_anon.html#VerifyEmailAnonymous_VerifyEmail/A liA HREF=mod_auth_anon.html#NoUserAnonymous_NoUser/A ! liA HREF=mod_auth_anon.html#AuthoritativeAnonymous_Authoritative/A liA HREF=mod_auth.html#authauthoritativeAuthAuthoritative/A liA HREF=mod_auth_db.html#authdbauthoritativeAuthDBAuthoritative/A liA HREF=mod_auth_db.html#authdbgroupfileAuthDBGroupFile/A 1.4 +2 -2 apache/htdocs/manual/mod/mod_auth_anon.html Index: mod_auth_anon.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_auth_anon.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** mod_auth_anon.html1996/12/02 18:14:01 1.3 --- mod_auth_anon.html1997/02/15 22:27:57 1.4 *** *** 81,87 /dd codedt ! a name=AuthorativeAnonymous_Authorative lt; on | off gt/a /code/dtdd Default is 'off'. When set 'on', there is no fall-through to other authorization methods. So if a --- 81,87 /dd codedt ! a name=AuthoritativeAnonymous_Authoritative lt; on | off gt/a /code/dtdd Default is 'off'. When set 'on', there is no fall-through to other authorization methods. So if a *** *** 162,168 /dd dtVersion 0.5br/dt ddAdded 'VerifyEmail' and 'LogEmail' options. Multiple ! 'anonymous' tokens allowed. more docs. Added Authorative functionality. /dd /dl --- 162,168 /dd dtVersion 0.5br/dt ddAdded 'VerifyEmail' and 'LogEmail' options. Multiple ! 'anonymous' tokens allowed. more docs. Added Authoritative functionality. /dd /dl 1.4 +4 -4 apache/htdocs/manual/mod/mod_auth_msql.html Index: mod_auth_msql.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_auth_msql.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** mod_auth_msql.html1996/12/02 18:14:02 1.3 --- mod_auth_msql.html1997/02/15 22:27:58 1.4 *** *** 52,58 Normally this table is compulsory, but it is possible to use a fall-through to other methods and use the mSQL module for group control only. ! See the a href=#AuthorativecodeAuth_MSQL_Authorative/code/a directive below. /dd --- 52,58 Normally this table is compulsory, but it is possible to use a fall-through to other methods and use the mSQL module for group control only. ! See the a href=#AuthoritativecodeAuth_MSQL_Authoritative/code/a directive below. /dd *** *** 109,115 /dd codedt ! a name=AuthorativeAuth_MSQL_Authorative lt; on | off gt/a /code/dtdd Default is 'on'. When set 'on', there is no fall-through to other authorization methods. So if a --- 109,115 /dd codedt ! a name=AuthoritativeAuth_MSQL_Authoritative lt; on | off gt/a /code/dtdd Default is 'on'. When set 'on', there is no fall-through to other authorization methods. So if a *** *** 239,245 codedt Auth_MSQL_nopasswd off br ! Auth_MSQL_Authorativeon br Auth_MSQL_EncryptedPasswords on br /code/dtdd These three optional fields (all set to the sensible defaults, ---
cvs commit: apache/src http_bprintf.c CHANGES
marc97/02/15 23:44:16
Modified:src http_bprintf.c CHANGES
Log:
Stop vbprintf from core dumping if given a NULL string pointer.
Submitted by: Ken Coar [EMAIL PROTECTED]
Reviewed by: Marc Slemko, Dean Gaudet, Jim Jagielski
Revision ChangesPath
1.8 +10 -0 apache/src/http_bprintf.c
Index: http_bprintf.c
===
RCS file: /export/home/cvs/apache/src/http_bprintf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** http_bprintf.c1996/11/03 20:36:34 1.7
--- http_bprintf.c1997/02/16 07:44:14 1.8
***
*** 42,47
--- 42,51
/*
* Max size of a format specifier is 1 + 5 + 7 + 7 + 2 + 1 + slop
*/
+ #define NULL_STRING (null)
+ /*
+ * String displayed if given a NULL pointer.
+ */
/*
* Copy n characters from *srcPtr to *destPtr, then increment
***
*** 277,282
--- 281,289
case 's':
charPtrArg = va_arg(arg, char *);
+ if (charPtrArg == NULL) {
+ charPtrArg = NULL_STRING;
+ };
if(precision == -1)
buffReqd = strlen(charPtrArg);
else
***
*** 444,449
--- 451,459
if(fastPath)
{
buffPtr = va_arg(arg, char *);
+ if (buffPtr == NULL) {
+ buffPtr = NULL_STRING;
+ };
buffCount = strlen(buffPtr);
buffLen = buffCount + 1;
}
1.161 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.160
retrieving revision 1.161
diff -C3 -r1.160 -r1.161
*** CHANGES 1997/02/15 12:26:19 1.160
--- CHANGES 1997/02/16 07:44:15 1.161
***
*** 1,5
--- 1,8
Changes with Apache 1.2b7
+ *) Stop vbprintf from crashing if given a NULL string pointer;
+ print (null) instead. [Ken Coar]
+
*) Don't disable Nagle algorithm if system doesn't have TCP_NODELAY.
[Marc Slemko and Roy Fielding]
