From: Jim Jagielski Date: Thu, 7 May 2015 16:25:55 +0000 (+0000) Subject: Merge r1664133, r1643284, r1621417 from trunk: X-Git-Tag: 2.4.13~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d00f421bf524b9e3655930c0d69e648e7bc5dc7;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/STATUS b/STATUS index 5c2cb725cab..c27575b9907 100644 --- a/STATUS +++ b/STATUS @@ -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) diff --git a/docs/man/ab.1 b/docs/man/ab.1 index f9df604f423..cbca2f80f6c 100644 --- a/docs/man/ab.1 +++ b/docs/man/ab.1 @@ -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\&. diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en index 9d0d18e0cf0..e7a5e848335 100644 --- a/docs/manual/mod/mod_log_config.html.en +++ b/docs/manual/mod/mod_log_config.html.en @@ -143,42 +143,44 @@ matching error log line to see what request caused what error. %m The request method. -%{VARNAME}n +%M + The time taken to serve the request, in milliseconds. +%{VARNAME}n The contents of note VARNAME from another module. -%{VARNAME}o +%{VARNAME}o The contents of VARNAME: header line(s) in the reply. -%p +%p The canonical port of the server serving the request. -%{format}p +%{format}p The canonical port of the server serving the request, or the server's actual port, or the client's actual port. Valid formats are canonical, local, or remote. -%P +%P The process ID of the child that serviced the request. -%{format}P +%{format}P The process ID or thread ID of the child that serviced the request. Valid formats are pid, tid, and hextid. hextid requires APR 1.2.0 or higher. -%q +%q The query string (prepended with a ? if a query string exists, otherwise an empty string). -%r +%r First line of request. -%R +%R The handler generating the response (if any). -%s +%s Status. For requests that have been internally redirected, this is the status of the original request. Use %>s for the final status. -%t +%t Time the request was received, in the format [18/Sep/2011:19:18:28 -0400]. The last number indicates the timezone offset from GMT -%{format}t +%{format}t The time, in the form given by format, which should be in an extended strftime(3) format (potentially localized). If the format starts with begin: (default) the time is taken @@ -198,19 +200,19 @@ formatting in the same format string. You can use multiple %{format}t tokens instead. -%T +%T The time taken to serve the request, in seconds. -%u +%u Remote user if the request was authenticated. May be bogus if return status (%s) is 401 (unauthorized). -%U +%U The URL path requested, not including any query string. -%v +%v The canonical ServerName of the server serving the request. -%V +%V The server name according to the UseCanonicalName setting. -%X +%X Connection status when response is completed: @@ -226,21 +228,21 @@
-%I +%I Bytes received, including request and headers. Cannot be zero. You need to enable mod_logio to use this. -%O +%O 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 mod_logio to use this. -%S +%S Bytes transferred (received and sent), including request and headers, cannot be zero. This is the combination of %I and %O. You need to enable mod_logio to use this. -%{VARNAME}^ti +%{VARNAME}^ti The contents of VARNAME: trailer line(s) in the request sent to the server. -%{VARNAME}^to +%{VARNAME}^to The contents of VARNAME: trailer line(s) in the response sent from the server. diff --git a/docs/manual/programs/ab.html.tr.utf8 b/docs/manual/programs/ab.html.tr.utf8 index 8da3aad326e..6d5d17cb9f0 100644 --- a/docs/manual/programs/ab.html.tr.utf8 +++ b/docs/manual/programs/ab.html.tr.utf8 @@ -28,6 +28,7 @@  ko  |  tr 

+
Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.

ab Apache Hiper Metin Aktarım Protokolü (HTTP) sunucunuzun başarımını ölçmek amacıyla kullanabileceğiniz bir diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index f33aa936d5e..2cd65bf151c 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -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(); diff --git a/server/mpm/event/fdqueue.c b/server/mpm/event/fdqueue.c index 485a98dc109..343146f4c65 100644 --- a/server/mpm/event/fdqueue.c +++ b/server/mpm/event/fdqueue.c @@ -17,7 +17,7 @@ #include "fdqueue.h" #include "apr_atomic.h" -static apr_uint32_t zero_pt = APR_UINT32_MAX/2; +static const apr_uint32_t zero_pt = APR_UINT32_MAX/2; struct recycled_pool { diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 821f69db484..ecd76c7cbf6 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -942,7 +942,7 @@ static int netware_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "caught SIGTERM, shutting down"); while (worker_thread_count > 0) { - printf ("\rShutdown pending. Waiting for %u thread(s) to terminate...", + printf ("\rShutdown pending. Waiting for %lu thread(s) to terminate...", worker_thread_count); apr_thread_yield(); } @@ -963,7 +963,7 @@ static int netware_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) /* Wait for all of the threads to terminate before initiating the restart */ while (worker_thread_count > 0) { - printf ("\rRestart pending. Waiting for %u thread(s) to terminate...", + printf ("\rRestart pending. Waiting for %lu thread(s) to terminate...", worker_thread_count); apr_thread_yield(); }