cvs commit: apachen/src/os/win32 os.h
jim 98/01/22 16:36:44 Modified:htdocs/manual upgrading_to_1_3.html htdocs/manual/misc FAQ.html perf-tuning.html htdocs/manual/mod core.html src CHANGES PORTING src/main conf.h http_main.c src/os/win32 os.h Log: Submitted by: Jim Jagielski Best of both worlds... Let the world know if we have mmap and/or shmget as well as controlling which to use for scoreboard. This should be a complete patch, so if any docs were skipped, feel free to update 'em Revision ChangesPath 1.8 +0 -10 apachen/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html === RCS file: /export/home/cvs/apachen/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- upgrading_to_1_3.html 1998/01/22 23:43:48 1.7 +++ upgrading_to_1_3.html 1998/01/23 00:36:29 1.8 @@ -58,16 +58,6 @@ licodemod_auth_msql/code has been removed from the distribution. - liSome #defines changed names for clarity. Specifically, - we want to make sure that developers know that we are - using shared memory for specific purposes and not as - a general we have this capability notice: - -pre - HAVE_MMAP -gt; USE_MMAP_SCOREBOARD - HAVE_SHMGET -gt; USE_SHMGET_SCOREBOARD -/pre - /ul h3Run-Time Configuration Changes/h3 1.99 +4 -4 apachen/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- FAQ.html 1998/01/22 23:18:56 1.98 +++ FAQ.html 1998/01/23 00:36:30 1.99 @@ -15,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.98 $ ($Date: 1998/01/22 23:18:56 $) + $Revision: 1.99 $ ($Date: 1998/01/23 00:36:30 $) /P P The latest version of this FAQ is always available from the main @@ -1805,9 +1805,9 @@ As a last-resort workaround, you can comment out the CODE#define USE_SHMGET_SCOREBOARD/CODE definition in the SAMPLINUX/SAMP section of - SAMPsrc/conf.h/SAMP and rebuild the server (prior to 1.3b4 the - definition was named CODE#define HAVE_SHMGET/CODE). This will produce - a server which is slower and less reliable. + SAMPsrc/conf.h/SAMP and rebuild the server (prior to 1.3b4, simply + removing CODE#define HAVE_SHMGET/CODE would have sufficed). This will + produce a server which is slower and less reliable. /P HR /LI 1.5 +6 -5 apachen/htdocs/manual/misc/perf-tuning.html Index: perf-tuning.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/perf-tuning.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perf-tuning.html 1998/01/22 23:11:49 1.4 +++ perf-tuning.html 1998/01/23 00:36:32 1.5 @@ -494,10 +494,11 @@ on-disk file. The on-disk file is not only slow, but it is unreliable (and less featured). Peruse the codesrc/main/conf.h/code file for your architecture and look for either codeUSE_MMAP_SCOREBOARD/code or -codeUSE_SHMGET_SCOREBOARD/code. Defining one of those two enables the -supplied shared memory code. If your system has another type of -shared memory then edit the file codesrc/main/http_main.c/code and -add the hooks necessary to use it in Apache. (Send us back a patch +codeUSE_SHMGET_SCOREBOARD/code. Defining one of those two (as +well as their companions codeHAVE_MMAP/code and codeHAVE_SHMGET/code +respectively) enables the supplied shared memory code. If your system has +another type of shared memory, edit the file codesrc/main/http_main.c/code +and add the hooks necessary to use it in Apache. (Send us back a patch too please.) pHistorical note: The Linux port of Apache didn't start to use @@ -706,7 +707,7 @@ pIt may even be the case that codemmap/code isn't used on your architecture, if so then defining codeUSE_MMAP_FILES/code -might work (if it works then report back to us). +and codeHAVE_MMAP/code might work (if it works then report back to us). pApache does its best to avoid copying bytes around in memory. The first write of any request typically is turned into a codewritev/code 1.91 +6 -4 apachen/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v retrieving revision 1.90 retrieving revision 1.91
cvs commit: apachen/src/main http_protocol.c
fielding98/01/22 20:11:33
Modified:src/main http_protocol.c
Log:
The other half of the fix for when die() happens we need to eat any
request body if one exists. The hack for ErrorDocument is removed
since it interferes with the fix and should not be needed anyway.
PR: 1399
Revision ChangesPath
1.178 +4 -4 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.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- http_protocol.c 1998/01/20 15:28:38 1.177
+++ http_protocol.c 1998/01/23 04:11:32 1.178
@@ -1391,13 +1391,13 @@
API_EXPORT(int) should_client_block(request_rec *r)
{
-if (r-read_length || is_HTTP_ERROR(r-status))
-return 0;
+/* First check if we have already read the request body */
-if (!r-read_chunked (r-remaining = 0))
+if (r-read_length || (!r-read_chunked (r-remaining = 0)))
return 0;
-if (r-proto_num = HTTP_VERSION(1,1)) { /* sending 100 Continue interim
response */
+if (r-proto_num = HTTP_VERSION(1,1)) {
+/* sending 100 Continue interim response */
bvputs(r-connection-client,
SERVER_PROTOCOL, , status_lines[0], \015\012\015\012,
NULL);
cvs commit: apachen/htdocs/manual/mod index.html mod_auth.html mod_auth_anon.html mod_auth_msql.html
coar98/01/23 08:13:58 Modified:htdocs/manual/misc FAQ.html htdocs/manual/mod index.html mod_auth.html mod_auth_anon.html Removed: htdocs/manual/mod mod_auth_msql.html Log: mod_auth_msql isn't part of the distribution any more, so take out all references to it that assume it is. Plus some miscellaneous HTML cleanup. Revision ChangesPath 1.100 +7 -6 apachen/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/FAQ.html,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- FAQ.html 1998/01/23 00:36:30 1.99 +++ FAQ.html 1998/01/23 16:13:50 1.100 @@ -15,7 +15,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.99 $ ($Date: 1998/01/23 00:36:30 $) + $Revision: 1.100 $ ($Date: 1998/01/23 16:13:50 $) /P P The latest version of this FAQ is always available from the main @@ -1803,11 +1803,12 @@ A HREF=http://www.linuxhq.com/HOWTO/META-FAQ.html; Linux newsgroup/mailing list/A. As a last-resort workaround, you can - comment out the CODE#define USE_SHMGET_SCOREBOARD/CODE definition in the + comment out the CODE#definenbsp;USE_SHMGET_SCOREBOARD/CODE + definition in the SAMPLINUX/SAMP section of SAMPsrc/conf.h/SAMP and rebuild the server (prior to 1.3b4, simply - removing CODE#define HAVE_SHMGET/CODE would have sufficed). This will - produce a server which is slower and less reliable. + removing CODE#definenbsp;HAVE_SHMGET/CODE would have sufficed). + This will produce a server which is slower and less reliable. /P HR /LI @@ -1892,8 +1893,8 @@ /A P You have probably configured the Host by specifying a FQHN, - and thus the libmsql will use a full blown tcp/ip socket to talk to - the database, rather than a fast internal device. The + and thus the SAMPlibmsql/SAMP will use a full blown TCP/IP socket + to talk to the database, rather than a fast internal device. The SAMPlibmsql/SAMP, the mSQL FAQ, and the SAMPmod_auth_msql/SAMP documentation warn you about this. If you have to use different hosts, check out the SAMPmod_auth_msql/SAMP code for 1.22 +0 -2 apachen/htdocs/manual/mod/index.html Index: index.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/index.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- index.html1997/10/24 09:34:21 1.21 +++ index.html1998/01/23 16:13:56 1.22 @@ -42,8 +42,6 @@ ddUser authentication using Berkeley DB files. dtA HREF=mod_auth_dbm.htmlmod_auth_dbm/A ddUser authentication using DBM files. -dtA HREF=mod_auth_msql.htmlmod_auth_msql/A Apache 1.2.* and earlier -ddUser authentication using mSQL files. dtA HREF=mod_autoindex.htmlmod_autoindex/A ddAutomatic directory listings. dtA HREF=mod_browser.htmlmod_browser/A Apache 1.2.* only 1.10 +2 -2 apachen/htdocs/manual/mod/mod_auth.html Index: mod_auth.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_auth.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_auth.html 1997/12/16 20:57:38 1.9 +++ mod_auth.html 1998/01/23 16:13:56 1.10 @@ -115,8 +115,8 @@ A common use for this is in conjunction with one of the database modules; such as a href=mod_auth_db.htmlcodemod_auth_db.c/code/a, a -href=mod_auth_dbm.htmlcodemod_auth_dbm.c/code/a, a -href=mod_auth_msql.htmlcodemod_auth_msql.c/code/a and a +href=mod_auth_dbm.htmlcodemod_auth_dbm.c/code/a, +codemod_auth_msql.c/code, and a href=mod_auth_anon.htmlcodemod_auth_anon.c/code/a. These modules supply the bulk of the user credential checking; but a few (administrator) related accesses fall through to a lower level with a 1.15 +1 -1 apachen/htdocs/manual/mod/mod_auth_anon.html Index: mod_auth_anon.html === RCS file: /export/home/cvs/apachen/htdocs/manual/mod/mod_auth_anon.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_auth_anon.html1997/09/16 04:06:03 1.14 +++ mod_auth_anon.html1998/01/23 16:13:57 1.15 @@ -156,7 +156,7 @@ h2a name=ExampleExample/A/h2 The example below (when combined with the Auth directives -of a htpasswd-file based (or GDM, mSQL etc) base access +of a htpasswd-file based (or GDM, mSQL EMetc./EM) base access control system allows users in as
cvs commit: apachen/src/main conf.h
jim 98/01/23 08:19:20 Modified:src/main conf.h Log: UnixWare: force continued use of mmap scoreboard Revision ChangesPath 1.176 +1 -1 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- conf.h1998/01/23 00:36:40 1.175 +++ conf.h1998/01/23 16:19:19 1.176 @@ -485,7 +485,7 @@ #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES #define HAVE_SHMGET -#define USE_SHMGET_SCOREBOARD +#undef USE_SHMGET_SCOREBOARD /* force use of mmap() scoreboard */ #define HAVE_CRYPT_H #define HAVE_SYS_SELECT_H #define HAVE_SYS_RESOURCE_H
cvs commit: apache/src Configuration.tmpl
dgaudet 98/01/23 10:53:41 Modified:src Tag: APACHE_1_2_X Configuration.tmpl Log: I'm tired of the damn bug reports. Revision ChangesPath No revision No revision 1.63.2.2 +3 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.63.2.1 retrieving revision 1.63.2.2 diff -u -r1.63.2.1 -r1.63.2.2 --- Configuration.tmpl1997/10/22 00:18:43 1.63.2.1 +++ Configuration.tmpl1998/01/23 18:53:40 1.63.2.2 @@ -41,6 +41,9 @@ # Settings here have priority; If not set, Configure will attempt to guess # the C compiler, and set OPTIM to '-O2' # +# REDHAT LINUX 5.0 USERS PLEASE NOTE! You have to add -lcrypt to +# EXTRA_LIBS. This is fixed in 1.3 but will not be fixed in 1.2. +# EXTRA_CFLAGS= EXTRA_LFLAGS= EXTRA_LIBS=
