cvs commit: apache/src mod_negotiation.c
brian 96/12/21 19:47:16
Modified:src mod_negotiation.c
Log:
Reviewed by: Randy Terbush, Brian Behlendorf
Submitted by: Paul Sutton
Change name of #define to make it clear this complies with draft 02 of Koen's
conneg proposal.
Revision ChangesPath
1.28 +3 -3 apache/src/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C3 -r1.27 -r1.28
*** mod_negotiation.c 1996/12/09 04:37:03 1.27
--- mod_negotiation.c 1996/12/22 03:47:14 1.28
***
*** 63,76
#include http_core.h
#include http_log.h
! /* define HOLTMAN to allow for Holtman I-D transparent negotiation.
* This file currently implements the draft-02, except for
* anything to do with features and cache-control (max-age etc)
*
* Since the draft is just that, and we don't yet implement
* everything, regard the transparent negotiation stuff as experimental.
*/
! /*#define HOLTMAN*/
/* Commands --- configuring document caching on a per (virtual?)
* server basis...
--- 63,76
#include http_core.h
#include http_log.h
! /* define TCN_02 to allow for Holtman I-D transparent negotiation.
* This file currently implements the draft-02, except for
* anything to do with features and cache-control (max-age etc)
*
* Since the draft is just that, and we don't yet implement
* everything, regard the transparent negotiation stuff as experimental.
*/
! /*#define TCN_02*/
/* Commands --- configuring document caching on a per (virtual?)
* server basis...
***
*** 455,461
do_header_line (r-pool, table_get (hdrs, Accept-charset));
new-avail_vars = make_array (r-pool, 40, sizeof (var_rec));
! #ifdef HOLTMAN
if (table_get(r-headers_in, Negotiate)) {
/* Negotiate: header tells us UA does transparent negotiation
* We have to decide whether we want to ... for now, yes,
--- 455,461
do_header_line (r-pool, table_get (hdrs, Accept-charset));
new-avail_vars = make_array (r-pool, 40, sizeof (var_rec));
! #ifdef TCN_02
if (table_get(r-headers_in, Negotiate)) {
/* Negotiate: header tells us UA does transparent negotiation
* We have to decide whether we want to ... for now, yes,
cvs commit: apache/htdocs/manual/mod mod_log_config.html
brian 96/12/21 20:05:17
Modified:htdocs/manual/mod mod_log_config.html
Log:
Reviewed by: Brian Behlendorf
Submitted by: James Cloos
The doc file was not in sync with the comment in the src file.
Revision ChangesPath
1.8 +14 -14apache/htdocs/manual/mod/mod_log_config.html
Index: mod_log_config.html
===
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_log_config.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** mod_log_config.html 1996/12/09 02:04:56 1.7
--- mod_log_config.html 1996/12/22 04:05:16 1.8
***
*** 102,124
%...b: Bytes sent.
%...f: Filename
%...h: Remote host
- %...l: Remote logname (from identd, if supplied)
- %...p: The port request was received on
- %...P: The process ID of the child that serviced the request
- %...r: First line of request
- %...s: Status. For requests that got internally redirected,
- this is status of the boriginal/b request --- %...s
- for the last.
- %...t: Time, in common log format time format
- %...T: The time taken to serve the request, in seconds
- %...u: Remote user (from auth; may be bogus if return
- status (%s) is 401)
- %...U: The URL path requested
- %...v: The name of the server (i.e. which virtual host)
%...{Foobar}i: The contents of Foobar: header line(s) in the request
sent to the client.
%...{Foobar}o: The contents of Foobar: header line(s) in the reply.
! %...{Foobar}n: The contents of note Foobar from another module
/PRE
The `...' can be nothing at all (e.g. code%h %u %r %s %b/code), or it
can
--- 102,124
%...b: Bytes sent.
%...f: Filename
%...h: Remote host
%...{Foobar}i: The contents of Foobar: header line(s) in the request
sent to the client.
+ %...l: Remote logname (from identd, if supplied)
+ %...{Foobar}n: The contents of note Foobar from another module.
%...{Foobar}o: The contents of Foobar: header line(s) in the reply.
! %...p: The port the request was served to
! %...P: The process ID of the child that serviced the request.
! %...r: First line of request
! %...s: Status. For requests that got internally redirected, this
! is status of the *original* request --- %...s for the last.
! %...t: Time, in common log format time format
! %...{format}t: The time, in the form given by format, which should
! be in strftime(3) format.
! %...T: The time taken to serve the request, in seconds.
! %...u: Remote user (from auth; may be bogus if return status (%s)
is 401)
! %...U: The URL path requested.
! %...v: The name of the server (i.e. which virtual host?)
/PRE
The `...' can be nothing at all (e.g. code%h %u %r %s %b/code), or it
can
cvs commit: apache/htdocs/manual/mod core.html
brian 96/12/21 20:39:57 Modified:htdocs/manual/mod core.html Log: Clarify meaning of Timeout. Revision ChangesPath 1.22 +16 -6 apache/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v retrieving revision 1.21 retrieving revision 1.22 diff -C3 -r1.21 -r1.22 *** core.html 1996/12/12 01:09:57 1.21 --- core.html 1996/12/22 04:39:56 1.22 *** *** 1101,1112 strongContext:/strong server configbr strongStatus:/strong corep ! The TimeOut directive sets the maximum time that the server will wait ! for the receipt of a request and the completion of a request, in seconds. ! So if it takes more than TimeOut seconds for a client to send a request or ! receive a response, the server will break off the connection. Thus TimeOut ! limits the maximum a transfer can take; for large files, and slow networks ! transfer times can be large. phr A name=userh2User directive/h2/A --- 1101,1122 strongContext:/strong server configbr strongStatus:/strong corep ! The TimeOut directive currently defines the amount of time Apache will ! wait for three things: ! ! OL ! LIThe total amount of time it takes to receive a GET request. ! LIThe amount of time between receipt of TCP packets on a POST or ! PUT request. ! LIThe amount of time between ACKs on transmissions of TCP packets ! in responses. ! /OL ! ! We plan on making these separately configurable at some point down the ! road. 1200 is very generous - you may consider turning it down to ! something smaller if you find the server getting swamped by ! half-completed connections from buggy browsers. ! phr A name=userh2User directive/h2/A
cvs commit: apache/htdocs/manual/mod core.html
brian 96/12/21 20:56:01 Modified:htdocs/manual/mod core.html Log: Reviewed by: Brian Behlendorf Submitted by: Martin Kraemer Typographical fixes. Revision ChangesPath 1.23 +3 -3 apache/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v retrieving revision 1.22 retrieving revision 1.23 diff -C3 -r1.22 -r1.23 *** core.html 1996/12/22 04:39:56 1.22 --- core.html 1996/12/22 04:56:00 1.23 *** *** 451,457 possible or desirable.p Note: if you start the server as a non-root user, it will fail to change ! to the specified, and will instead continue to run as the group of the original user. p Special note: Use of this directive in lt;VirtualHostgt; requires a --- 451,457 possible or desirable.p Note: if you start the server as a non-root user, it will fail to change ! to the specified group, and will instead continue to run as the group of the original user. p Special note: Use of this directive in lt;VirtualHostgt; requires a *** *** 472,478 This information is logged in the access log. emBoolean/em is either codeon/code or codeoff/code.p ! The information should not trusted in any way except for rudimentary usage tracking.phr A NAME=ifmoduleH2lt;IfModulegt;/H2/A --- 472,478 This information is logged in the access log. emBoolean/em is either codeon/code or codeoff/code.p ! The information should not be trusted in any way except for rudimentary usage tracking.phr A NAME=ifmoduleH2lt;IfModulegt;/H2/A *** *** 885,891 This feature can be disabled using: blockquotecodeResourceConfig /dev/null/code/blockquote Historically, this file contained most directives except for server ! configuration directives and A HREF=#directorylt;Directorygt;/A. sections; in fact it can now contain any server directive allowed in the emserver config/em context.p --- 885,891 This feature can be disabled using: blockquotecodeResourceConfig /dev/null/code/blockquote Historically, this file contained most directives except for server ! configuration directives and A HREF=#directorylt;Directorygt;/A sections; in fact it can now contain any server directive allowed in the emserver config/em context.p
cvs commit: apache/src mod_actions.c
brian 96/12/21 21:13:02 Modified:src mod_actions.c Log: Reviewed by: Brian Behlendorf Submitted by: Rob Hartill Fixed typo. Revision ChangesPath 1.9 +3 -3 apache/src/mod_actions.c Index: mod_actions.c === RCS file: /export/home/cvs/apache/src/mod_actions.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C3 -r1.8 -r1.9 *** mod_actions.c 1996/12/01 20:28:42 1.8 --- mod_actions.c 1996/12/22 05:13:01 1.9 *** *** 60,68 * * Action mime/type /cgi-bin/script * ! * will activate /cgi-bin/script when a file of content type mime/type. It ! * sends the URL and file path of the requested document using the standard ! * CGI PATH_INFO and PATH_TRANSLATED environment variables. * */ --- 60,68 * * Action mime/type /cgi-bin/script * ! * will activate /cgi-bin/script when a file of content type mime/type is ! * requested. It sends the URL and file path of the requested document using ! * the standard CGI PATH_INFO and PATH_TRANSLATED environment variables. * */
cvs commit: apache/htdocs/manual/mod core.html
brian 96/12/21 21:38:05 Modified:htdocs/manual custom-error.html htdocs/manual/mod core.html Log: Reviewed by: Brian Behlendorf Submitted by: John Line, WWW server manager [EMAIL PROTECTED] Fixed oversight in documentation of error_document. Revision ChangesPath 1.5 +96 -63apache/htdocs/manual/custom-error.html Index: custom-error.html === RCS file: /export/home/cvs/apache/htdocs/manual/custom-error.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** custom-error.html 1996/12/02 18:13:39 1.4 --- custom-error.html 1996/12/22 05:37:58 1.5 *** *** 8,37 H1Custom error responses/H1 DL DTPurpose ! DDAdditional functionality. Allows web-masters to configure the response of ! Apache to some error or problem.BR ! PCustomizable responses can be defined to be activated in the event of a ! server detected error or problem.BR ! e.g. if a script crashes and produces a 500 Server Error response, then ! this response can be replaced with either some friendlier text or by a ! redirection to another URL (local or external). DTOld behavior ! DDNCSA httpd 1.3 would return some boring old error/problem message which ! would often be meaningless to the user, and would provide no means of logging ! the symptoms which caused it.BRBR DTNew behavior ! DDThe server can be asked to; ! OL ! LIDisplay some other text, instead of the NCSA hard coded messages, or ! LIredirect to a local URL, or ! LIredirect to an external URL. ! /OL ! PRedirecting to another URL can be useful, but only if some information ! can be passed which can then be used to explain and/or log the error/problem ! more clearly.BRTo achieve this, Apache will define new CGI-like environment ! variables, e.g. ! blockquotecode REDIRECT_HTTP_ACCEPT=*/*, image/gif, image/x-xbitmap, image/jpeg br REDIRECT_HTTP_USER_AGENT=Mozilla/1.1b2 (X11; I; HP-UX A.09.05 9000/712) br REDIRECT_PATH=.:/bin:/usr/local/bin:/etc br --- 8,54 H1Custom error responses/H1 DL + DTPurpose ! ! DDAdditional functionality. Allows webmasters to configure the response of ! Apache to some error or problem. ! ! PCustomizable responses can be defined to be activated in the ! event of a server detected error or problem. ! ! Pe.g. if a script crashes and produces a 500 Server Error ! response, then this response can be replaced with either some ! friendlier text or by a redirection to another URL (local or ! external). ! ! P ! DTOld behavior ! ! DDNCSA httpd 1.3 would return some boring old error/problem message ! which would often be meaningless to the user, and would provide no ! means of logging the symptoms which caused it.BR ! ! P ! DTNew behavior ! ! DDThe server can be asked to; ! OL ! LIDisplay some other text, instead of the NCSA hard coded messages, or ! LIredirect to a local URL, or ! LIredirect to an external URL. ! /OL ! ! PRedirecting to another URL can be useful, but only if some information ! can be passed which can then be used to explain and/or log the error/problem ! more clearly. ! ! PTo achieve this, Apache will define new CGI-like environment ! variables, e.g. ! ! blockquotecode REDIRECT_HTTP_ACCEPT=*/*, image/gif, image/x-xbitmap, image/jpeg br REDIRECT_HTTP_USER_AGENT=Mozilla/1.1b2 (X11; I; HP-UX A.09.05 9000/712) br REDIRECT_PATH=.:/bin:/usr/local/bin:/etc br *** *** 42,106 REDIRECT_SERVER_PORT=80 br REDIRECT_SERVER_SOFTWARE=Apache/0.8.15 br REDIRECT_URL=/cgi-bin/buggy.pl br ! /code/blockquote ! note the codeREDIRECT_/code prefix. p ! At least codeREDIRECT_URL/code and codeREDIRECT_QUERY_STRING/code will ! be passed to the new URL (assuming it's a cgi-script or a cgi-include). The ! other variables will exist only if they existed prior to the error/problem.p DTConfiguration ! DDemfile: /emserver configurationBR ! PHere are some examples... ! blockquotecode ErrorDocument 500 /cgi-bin/crash-recover br ! ErrorDocument 500 Sorry, our script crashed because %s. Oh dearbr ErrorDocument 500 http://xxx/ br ErrorDocument 404 /Lame_excuses/not_found.html br ErrorDocument 401 /Subscription/how_to_subscribe.html ! /code/blockquote ! The syntax is, p ! codeA HREF=mod/core.html#errordocumentErrorDocument/A/code ! lt;3-digit-codegt; action p ! ! where the action can be, ! OL ! LIText to be displayed.BRPrefix the text with a quote (quot;). Whatever ! follows the quote is displayed. If the error/problem produced any additional ! information, it can be specified
