Commit 90745f9f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1664133, r1643284, r1621417 from trunk: 

* Fix typo in error message

mpm_event(opt): zero is immutable.

Fix printf format spotted by cppcheck.
Untested.
Submitted by: rpluem, ylavic, jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1678232 13f79535-47bb-0310-9956-ffa450edef68
parent efca1ebd

STATUS

+0 −11
Changes for STATUS: 0 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -105,17 +105,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * Easy patches - synch with trunk

        - mod_proxy_balancer: Fix typo in error message

        - mpm_event(opt): zero is immutable.

        - mpm_netware: Fix printf format spotted by cppcheck.

     trunk patch:

        http://svn.apache.org/r1664133

        http://svn.apache.org/r1643284       (minor the part for eventopt)

        http://svn.apache.org/r1621417

     2.4.x patch: trunk works

     +1: jailletc36, jim, trawick



   * mod_ssl: consistently output SSLCertificateChainFile deprecation warnings

     trunk patch: https://svn.apache.org/r1676085

     2.4.x patch: trunk patch works (modulo CHANGES)

docs/man/ab.1

+2 −2
Changes for docs/man/ab.1: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
.el .ne 3

.IP "\\$1" \\$2

..

.TH "AB" 1 "2014-06-24" "Apache HTTP Server" "ab"

.TH "AB" 1 "2015-05-01" "Apache HTTP Server" "ab"



.SH NAME

ab \- Apache HTTP server benchmarking tool
@@ -80,7 +80,7 @@ Do HEAD requests instead of GET\&. 
Enable the HTTP KeepAlive feature, \fIi\&.e\&.\fR, perform multiple requests within one HTTP session\&. Default is no KeepAlive\&.  

.TP

-l

Do not report errors if the length of the responses is not constant\&. This can be usefull for dynamic pages\&. Available in 2\&.4\&.7 and later\&.  

Do not report errors if the length of the responses is not constant\&. This can be useful for dynamic pages\&. Available in 2\&.4\&.7 and later\&.  

.TP

-m \fIHTTP-method\fR

Custom HTTP method for the requests\&. Available in 2\&.4\&.10 and later\&.

docs/manual/mod/mod_log_config.html.en

+25 −23
Changes for docs/manual/mod/mod_log_config.html.en: 25 added lines, 23 removed lines.
Original line number Diff line number Diff line
@@ -143,42 +143,44 @@ 
            matching error log line to see what request caused what error.</td></tr>

<tr><td><code>%m</code></td>

        <td>The request method.</td></tr>

<tr class="odd"><td><code>%{<var>VARNAME</var>}n</code></td>

<tr class="odd"><td><code>%M</code></td>

        <td>The time taken to serve the request, in milliseconds.</td></tr>

<tr><td><code>%{<var>VARNAME</var>}n</code></td>

        <td>The contents of note <var>VARNAME</var> from another

        module.</td></tr>

<tr><td><code>%{<var>VARNAME</var>}o</code></td>

<tr class="odd"><td><code>%{<var>VARNAME</var>}o</code></td>

        <td>The contents of <code><var>VARNAME</var>:</code> header line(s)

        in the reply.</td></tr>

<tr class="odd"><td><code>%p</code></td>

<tr><td><code>%p</code></td>

        <td>The canonical port of the server serving the request.</td></tr>

<tr><td><code>%{<var>format</var>}p</code></td>

<tr class="odd"><td><code>%{<var>format</var>}p</code></td>

        <td>The canonical port of the server serving the request, or the

        server's actual port, or the client's actual port. Valid formats

        are <code>canonical</code>, <code>local</code>, or <code>remote</code>.

        </td></tr>

<tr class="odd"><td><code>%P</code></td>

<tr><td><code>%P</code></td>

        <td>The process ID of the child that serviced the request.</td></tr>

<tr><td><code>%{<var>format</var>}P</code></td>

<tr class="odd"><td><code>%{<var>format</var>}P</code></td>

        <td>The process ID or thread ID of the child that serviced the

        request.  Valid formats are <code>pid</code>, <code>tid</code>,

        and <code>hextid</code>.  <code>hextid</code> requires APR 1.2.0 or

        higher.

        </td></tr>

<tr class="odd"><td><code>%q</code></td>

<tr><td><code>%q</code></td>

        <td>The query string (prepended with a <code>?</code> if a query

        string exists, otherwise an empty string).</td></tr>

<tr><td><code>%r</code></td>

<tr class="odd"><td><code>%r</code></td>

        <td>First line of request.</td></tr>

<tr class="odd"><td><code>%R</code></td>

<tr><td><code>%R</code></td>

        <td>The handler generating the response (if any).</td></tr>

<tr><td><code>%s</code></td>

<tr class="odd"><td><code>%s</code></td>

        <td>Status. For requests that have been internally redirected, this is

        the status of the <em>original</em> request. Use <code>%&gt;s</code>

        for the final status.</td></tr>

<tr class="odd"><td><code>%t</code></td>

<tr><td><code>%t</code></td>

        <td>Time the request was received, in the format <code>[18/Sep/2011:19:18:28 -0400]</code>.

        The last number indicates the timezone offset from GMT</td></tr>

<tr><td><code>%{<var>format</var>}t</code></td>

<tr class="odd"><td><code>%{<var>format</var>}t</code></td>

        <td>The time, in the form given by format, which should be in

        an extended <code>strftime(3)</code> format (potentially localized).

        If the format starts with <code>begin:</code> (default) the time is taken
@@ -198,19 +200,19 @@ 
        formatting in the same format string. You can use multiple

        <code>%{<var>format</var>}t</code> tokens instead.

        </td></tr>

<tr class="odd"><td><code>%T</code></td>

<tr><td><code>%T</code></td>

        <td>The time taken to serve the request, in seconds.</td></tr>

<tr><td><code>%u</code></td>

<tr class="odd"><td><code>%u</code></td>

        <td>Remote user if the request was authenticated. May be bogus if return status

        (<code>%s</code>) is 401 (unauthorized).</td></tr>

<tr class="odd"><td><code>%U</code></td>

<tr><td><code>%U</code></td>

        <td>The URL path requested, not including any query string.</td></tr>

<tr><td><code>%v</code></td>

<tr class="odd"><td><code>%v</code></td>

        <td>The canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>

        of the server serving the request.</td></tr>

<tr class="odd"><td><code>%V</code></td>

<tr><td><code>%V</code></td>

        <td>The server name according to the <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> setting.</td></tr>

<tr><td><code>%X</code></td>

<tr class="odd"><td><code>%X</code></td>

        <td>Connection status when response is completed:



        <table>
@@ -226,21 +228,21 @@ 
        </table>



        </td></tr>

<tr class="odd"><td><code>%I</code></td>

<tr><td><code>%I</code></td>

        <td>Bytes received, including request and headers. Cannot be zero.

        You need to enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>

<tr><td><code>%O</code></td>

<tr class="odd"><td><code>%O</code></td>

        <td>Bytes sent, including headers. May be zero in rare cases

        such as when a request is aborted before a response is sent.

        You need to enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>

<tr class="odd"><td><code>%S</code></td>

<tr><td><code>%S</code></td>

        <td>Bytes transferred (received and sent), including request and headers,

        cannot be zero. This is the combination of %I and %O. You need to

        enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>

<tr><td><code>%{<var>VARNAME</var>}^ti</code></td>

<tr class="odd"><td><code>%{<var>VARNAME</var>}^ti</code></td>

        <td>The contents of <code><var>VARNAME</var>:</code> trailer line(s)

        in the request sent to the server.  </td></tr>

<tr class="odd"><td><code>%{<var>VARNAME</var>}^to</code></td>

<tr><td><code>%{<var>VARNAME</var>}^to</code></td>

        <td>The contents of <code><var>VARNAME</var>:</code> trailer line(s)

        in the response sent from the server.  </td></tr>

</table>

docs/manual/programs/ab.html.tr.utf8

+1 −0
Changes for docs/manual/programs/ab.html.tr.utf8: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
<a href="../ko/programs/ab.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |

<a href="../tr/programs/ab.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>

</div>

<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>



    <p><code><strong>ab</strong></code> Apache Hiper Metin Aktarım Protokolü

      (HTTP) sunucunuzun başarımını ölçmek amacıyla kullanabileceğiniz bir

modules/proxy/mod_proxy_balancer.c

+1 −1
Changes for modules/proxy/mod_proxy_balancer.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int proxy_balancer_post_request(proxy_worker *worker, 
        && (apr_table_get(r->notes, "proxy_timedout")) != NULL) {

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02460)

                      "%s: Forcing worker (%s) into error state "

                      "due to timeout and 'failonstatus' parameter being set",

                      "due to timeout and 'failontimeout' parameter being set",

                       balancer->s->name, ap_proxy_worker_name(r->pool, worker));

        worker->s->status |= PROXY_WORKER_IN_ERROR;

        worker->s->error_time = apr_time_now();