Re: cvs commit: apache/htdocs/manual/mod mod_auth_anon.html mod_example.html mod_mime.html mod_proxy.html
Aw shoot, this one is screwed up. Dean On 2 Nov 1997 [EMAIL PROTECTED] wrote: dgaudet 97/11/01 16:16:11 Modified:htdocs/manual Tag: APACHE_1_2_X LICENSE install.html invoking.html suexec.html vhosts-in-depth.html htdocs/manual/misc Tag: APACHE_1_2_X FAQ.html compat_notes.html fin_wait_2.html perf.html htdocs/manual/mod Tag: APACHE_1_2_X mod_auth_anon.html mod_example.html mod_mime.html mod_proxy.html Log: yet more merges from 1.3 Revision ChangesPath No revision No revision 1.3.2.1 +2 -1 apache/htdocs/manual/LICENSE Index: LICENSE === RCS file: /export/home/cvs/apache/htdocs/manual/LICENSE,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- LICENSE 1997/01/01 18:32:13 1.3 +++ LICENSE 1997/11/02 00:15:58 1.3.2.1 @@ -20,7 +20,8 @@ * * 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. + *prior written permission. For written permission, please contact + *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: 1.9.2.2 +8 -3 apache/htdocs/manual/install.html Index: install.html === RCS file: /export/home/cvs/apache/htdocs/manual/install.html,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- install.html1997/11/01 23:39:21 1.9.2.1 +++ install.html1997/11/02 00:15:59 1.9.2.2 @@ -51,7 +51,7 @@ LI Select modules to compile into Apache in the CODEConfiguration/CODE file. Uncomment lines corresponding to - those optional modules you wish to include (among the Module lines + those optional modules you wish to include (among the AddModule lines at the bottom of the file), or add new lines corresponding to additional modules you have downloaded or written. (See A HREF=misc/API.htmlAPI.html/A for preliminary docs on how to @@ -83,7 +83,12 @@ + configured for lt;whatevergt; platform + setting C compiler to lt;whatevergt; * + setting C compiler optimization-level to lt;whatevergt; * -% + + Adding selected modules + + doing sanity check on compiler and options +Creating Makefile in support +Creating Makefile in main +Creating Makefile in os/unix +Creating Makefile in modules/standard /PRE /BLOCKQUOTE @@ -159,7 +164,7 @@ To start the server, simply run CODEhttpd/CODE. This will look for CODEhttpd.conf/CODE in the location compiled into the code (by -default CODE/usr/local/etc/httpd/conf/httpd.conf/CODE). If +default CODE/usr/local/apache/conf/httpd.conf/CODE). If this file is somewhere else, you can give the real location with the -f argument. For example: 1.11.2.2 +1 -1 apache/htdocs/manual/invoking.html Index: invoking.html === RCS file: /export/home/cvs/apache/htdocs/manual/invoking.html,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -r1.11.2.1 -r1.11.2.2 --- invoking.html 1997/11/01 23:39:21 1.11.2.1 +++ invoking.html 1997/11/02 00:16:00 1.11.2.2 @@ -30,7 +30,7 @@ ddSet the initial value for the A HREF=mod/core.html#serverrootServerRoot/A variable to emserverroot/em. This can be overridden by the ServerRoot command in the -configuration file. The default is code/usr/local/etc/httpd/code. +configuration file. The default is code/usr/local/apache/code. dtcode-f/code emconfig/em ddExecute the commands in the file emconfig/em on startup. If 1.11.2.3 +6 -6 apache/htdocs/manual/suexec.html Index: suexec.html === RCS file: /export/home/cvs/apache/htdocs/manual/suexec.html,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -r1.11.2.2 -r1.11.2.3 --- suexec.html 1997/11/01 23:39:25 1.11.2.2 +++ suexec.html 1997/11/02 00:16:00 1.11.2.3 @@ -326,14 +326,14 @@ * transactions and errors logged for auditing and * debugging purposes. */ - #define LOG_EXEC /usr/local/etc/httpd/logs/cgi.log /* Need me? */ + #define LOG_EXEC /usr/local/apache/logs/cgi.log /* Need me? */ /* * DOC_ROOT -- Define as the DocumentRoot set for Apache.
cvs commit: apache/htdocs/manual/mod core.html mod_actions.html mod_auth_anon.html mod_auth_dbm.html mod_cern_meta.html mod_cgi.html mod_env.html mod_example.html mod_imap.html mod_include.html mod_mime.html mod_negotiation.html mod_proxy.html mod_status.html
dgaudet 97/11/01 16:19:48 Modified:htdocs/manual Tag: APACHE_1_2_X LICENSE content-negotiation.html custom-error.html dns-caveats.html env.html host.html index.html install.html invoking.html man-template.html multilogs.html new_features_1_0.html new_features_1_1.html new_features_1_2.html process-model.html suexec.html vhosts-in-depth.html virtual-host.html htdocs/manual/misc Tag: APACHE_1_2_X API.html FAQ.html client_block_api.html compat_notes.html fin_wait_2.html nopgp.html perf-bsd44.html perf-dec.html perf.html security_tips.html vif-info.html htdocs/manual/mod Tag: APACHE_1_2_X core.html mod_actions.html mod_auth_anon.html mod_auth_dbm.html mod_cern_meta.html mod_cgi.html mod_env.html mod_example.html mod_imap.html mod_include.html mod_mime.html mod_negotiation.html mod_proxy.html mod_status.html Removed: htdocs/manual/misc Tag: APACHE_1_2_X known_client_problems.html Log: forget it, revert the last two changes Revision ChangesPath No revision No revision 1.3.2.2 +1 -2 apache/htdocs/manual/LICENSE Index: LICENSE === RCS file: /export/home/cvs/apache/htdocs/manual/LICENSE,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- LICENSE 1997/11/02 00:15:58 1.3.2.1 +++ LICENSE 1997/11/02 00:19:04 1.3.2.2 @@ -20,8 +20,7 @@ * * 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] + *prior written permission. * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: 1.10.2.2 +11 -11apache/htdocs/manual/content-negotiation.html Index: content-negotiation.html === RCS file: /export/home/cvs/apache/htdocs/manual/content-negotiation.html,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -r1.10.2.1 -r1.10.2.2 --- content-negotiation.html 1997/11/01 23:39:18 1.10.2.1 +++ content-negotiation.html 1997/11/02 00:19:05 1.10.2.2 @@ -22,7 +22,7 @@ couple of features to give more intelligent handling of requests from browsers which send incomplete negotiation information. p -Content negotiation is provided by the +Content negotiation is provided by the a href=mod/mod_negotiation.htmlmod_negotiation/a module, which is compiled in by default. @@ -47,7 +47,7 @@ /pre Note that this preference will only be applied when there is a choice -of representations and they vary by language. +of representations and they vary by language. p As an example of a more complex request, this browser has been @@ -78,12 +78,12 @@ In order to negotiate a resource, the server needs to be given information about each of the variants. This is done in one of two -ways: +ways: ul li Using a type map (i.e., a code*.var/code file) which names the files containing the variants explicitly - li Or using a 'MultiViews' search, where the server does an implicit + li Or using a 'MultiViews' search, where the server does an implicit filename pattern match, and chooses from among the results. /ul @@ -154,7 +154,7 @@ interpreted as URLs relative to the map file; they must be on the same server (!), and they must refer to files to which the client would be granted access if they were to be requested - directly. + directly. dt codeContent-type:/code dd media type --- charset, level and qs parameters may be given. These are often referred to as MIME types; typical media types are @@ -244,7 +244,7 @@ trthDimension thNotes trtdMedia Type -tdBrowser indicates preferences on Accept: header. Each item +tdBrowser indicates preferences on Accept: header. Each item can have an associated quality factor. Variant description can also have a quality factor. trtdLanguage @@ -292,7 +292,7 @@ else the order of languages on the Accept-Language header. liSelect the variants with the highest 'level' media parameter - (used to give the version of text/html media types). + (used to give the version of text/html media types).
cvs commit: apachen/src/main buff.c
ben 97/11/02 06:04:37
Modified:src/main buff.c
Log:
Correct error checking in recvwithtimeout().
Revision ChangesPath
1.49 +8 -4 apachen/src/main/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apachen/src/main/buff.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- buff.c1997/11/01 21:13:20 1.48
+++ buff.c1997/11/02 14:04:36 1.49
@@ -167,15 +167,19 @@
FD_SET(sock, fdset);
tv.tv_usec = 0;
rv = select(FD_SETSIZE, fdset, NULL, NULL, tv);
- if (rv == 0) {
+ if (rv == SOCKET_ERROR)
+ err = WSAGetLastError();
+ else if (rv == 0) {
ioctlsocket(sock, FIONBIO, iostate);
check_alarm();
WSASetLastError(WSAEWOULDBLOCK);
return (SOCKET_ERROR);
}
- rv = recv(sock, buf, len, flags);
- if (rv == SOCKET_ERROR)
- err = WSAGetLastError();
+ else {
+ rv = recv(sock, buf, len, flags);
+ if (rv == SOCKET_ERROR)
+ err = WSAGetLastError();
+ }
}
}
ioctlsocket(sock, FIONBIO, iostate);
