Commit 59de4356 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  *) Changed the late-1.3 log_config substitution %c to %X (logs the
     status of the closed connection) as it conflicts with the far more
     common, historical ssl logging directive %...{var}c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90417 13f79535-47bb-0310-9956-ffa450edef68
parent 9ca59c79

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.25-dev



  *) Changed the late-1.3 log_config substitution %c to %X, to log the

     status of the closed connection, as it conflicts with the far more

     common, historical ssl logging directive %...{var}c.  [William Rowe]



  *) Added the common error/ tree to the build/install targets 

     (similar to the common icons/ tree) for the multi-language error 

     messages that Lars committed earlier.  [William Rowe]

docs/manual/mod/mod_log_config.html

+6 −4
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ by the values as follows:</p> 
%...B:          Bytes sent, excluding HTTP headers.

%...b:          Bytes sent, excluding HTTP headers. In CLF format

		i.e. a '-' rather than a 0 when no bytes are sent.

%...c:          Connection status when response is completed.

                'X' = connection aborted before the response completed.

                '+' = connection may be kept alive after the response is sent.

                '-' = connection will be closed after the response is sent.

%...{Foobar}C:	The contents of cookie "Foobar" in the request sent to the

                server.

%...D:          The time taken to serve the request, in microseconds.
@@ -115,6 +111,12 @@ by the values as follows:</p> 
%...U:          The URL path requested, not including any query string.

%...v:          The canonical ServerName of the server serving the request.

%...V:          The server name according to the UseCanonicalName setting.

%...X:          Connection status when response is completed.

                'X' = connection aborted before the response completed.

                '+' = connection may be kept alive after the response is sent.

                '-' = connection will be closed after the response is sent.

                (This directive was %...c in late versions of Apache 1.3, but

                 this conflicted with the historical ssl %...{var}c syntax.)

</PRE>



<p>The "..." can be nothing at all (<EM>e.g.</EM>, <CODE>"%h %u %r %s

modules/loggers/mod_log_config.c

+8 −6
Original line number Diff line number Diff line
@@ -121,10 +121,6 @@ 
 * %...B:  bytes sent, excluding HTTP headers.

 * %...b:  bytes sent, excluding HTTP headers in CLF format, i.e. a '-'

 *         when no bytes where sent (rather than a '0'.

 * %...c:  Status of the connection.

 *         'X' = connection aborted before the response completed.

 *         '+' = connection may be kept alive after the response is sent.

 *         '-' = connection will be closed after the response is sent.

 * %...{FOOBAR}C:  The contents of the HTTP cookie FOOBAR

 * %...{FOOBAR}e:  The contents of the environment variable FOOBAR

 * %...f:  filename
@@ -153,6 +149,12 @@ 
 * %...m:  the request method

 * %...H:  the request protocol

 * %...q:  the query string prepended by "?", or empty if no query string

 * %...X:  Status of the connection.

 *         'X' = connection aborted before the response completed.

 *         '+' = connection may be kept alive after the response is sent.

 *         '-' = connection will be closed after the response is sent.

           (This directive was %...c in late versions of Apache 1.3, but

            this conflicted with the historical ssl %...{var}c syntax.)

*

 * The '...' can be nothing at all (e.g. "%h %u %r %s %b"), or it can

 * indicate conditions for inclusion of the item (which will cause it
@@ -1203,7 +1205,7 @@ static void log_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp) 
        log_pfn_register(p, "H", log_request_protocol, 0);

        log_pfn_register(p, "m", log_request_method, 0);

        log_pfn_register(p, "q", log_request_query, 0);

        log_pfn_register(p, "c", log_connection_status, 0);

        log_pfn_register(p, "X", log_connection_status, 0);

        log_pfn_register(p, "C", log_cookie, 0);

        log_pfn_register(p, "r", log_request_line, 1);

        log_pfn_register(p, "D", log_request_duration_microseconds, 1);