]>
granicus.if.org Git - apache/log
Yann Ylavic [Tue, 29 May 2018 21:39:44 +0000 (21:39 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832499 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:38:29 +0000 (21:38 +0000)]
80 col and alignment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832498 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:27:43 +0000 (21:27 +0000)]
Backported in r1832495.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832496 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:27:15 +0000 (21:27 +0000)]
Merge r1829513 from trunk:
* modules/ssl/ssl_engine_init.c (ssl_init_Module): Don't enable SSL
for a vhost if SSLEnable is not used and no certs are configured,
even if the Listen protocol is "https". Restores behaviour to that
prior to r1809303 for configs which would now otherwise fail at
startup.
Submitted by: jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832495 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:24:48 +0000 (21:24 +0000)]
Backported in r1832493.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832494 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:24:11 +0000 (21:24 +0000)]
core: use strncmp in check_errorlog_dir and core_dump_config when checking
if the ErrorLog directive is configured with the 'syslog' prefix. PR 62102
trunk patch: none, as far as I can see the code in trunk diverged too much
due to the code in STALLED for ap_errorlog_provider.
Submitted by: elukey, jhriggs, jailletc36
Reviewed by: elukey, jhriggs, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832493 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:20:09 +0000 (21:20 +0000)]
Backported in r1832491..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832492 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:19:30 +0000 (21:19 +0000)]
Merge r1703248, r1827366 from trunk:
core: Avoid a compiler warning when NO_LINGCLOSE is used (-Wunreachable-code).
Also, check c->aborted before apr_socket_shutdown() because it is set earlier,
and there is no point in calling shutdown() before close().
mod_ldap: fix format warnings.
Submitted by: ylavic
Reviewed by: jailletc36, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832491 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:17:00 +0000 (21:17 +0000)]
Backported in r1832489.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832490 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:16:29 +0000 (21:16 +0000)]
Merge r1826687, r1827166, r1828210, r1828232, r1828687 from trunk:
Instrument 'bbout'
mod_http2: use proper ARP defined for formatting apr_off_t
On the trunk:
mod_http2: on level trace2, log any unsuccessful HTTP/2 direct connection upgrade
with base64 encoding to unify its appearance in possible bug reports.
On the trunk:
* mod_http2: calculate unencrypted connection sniffing base64 only when log level is at required height. [Ruediger Pluem]
On the trunk:
mod_http2: accurate reporting of h2 data input/output per request via mod_logio. Fixes
an issue where output sizes where counted n-times on reused slave connections. See
gituhub issue: https://github.com/icing/mod_h2/issues/158
Submitted by: jailletc36, icing, icing, icing, icing
Reviewed by: icing, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832489 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:10:04 +0000 (21:10 +0000)]
Backported in r1832487.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832488 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:09:31 +0000 (21:09 +0000)]
Merge r1828879 from trunk:
On the trunk:
mod_http2: always wake up any conditional waits when streams are aborted. Fixes race conditions where timeouts would trigger instead.
Submitted by: icing
Reviewed by: icing, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832487 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:07:20 +0000 (21:07 +0000)]
Backported in r1832485.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832486 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 21:06:49 +0000 (21:06 +0000)]
Merge r1822849, r1822858, r1822878, r1822879, r1822883, r1828485, r1828493 from trunk:
* When mod_http2 is loaded more then ThreadsPerChild backend connections can
be useful as mod_http2 has an additional thread pool on top of
ThreadsPerChild.
But leave the default with ThreadsPerChild.
* Add some some comment why we do not limit hmax any longer
mod_proxy: follow up to r1822849.
Get the help(er) of mod_http2 to determine how much connections should
be handled in the reslist by default (i.e. max_threads).
mod_proxy: follow up to r1822849 and r1822878.
Does r1822878's "static" APR_RETRIEVE_OPTIONAL_FN work if, say, mod_proxy is
builtin but mod_http2 isn't?
Not worth taking the risk here since it's not a fast path...
Note: if this is an issue, I'm afraid it applies elsewhere too.
mod_proxy: follow up to r1822849 and r1822879.
Fix my maths, thanks Stefan and Rüdiger!
needs mod_http2.h
* Add missing CHANGES entry for revisions
1822849 ,
1822858 ,
1822878 ,
1822879 ,
1822883 ,
1828485
Submitted by: rpluem, ylavic, ylavic, ylavic, gsmith, rpluem
Reviewed by: rpluem, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832485 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 20:32:41 +0000 (20:32 +0000)]
Changes from Ruediger's review (slotmem_shm).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832480 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 19:15:50 +0000 (19:15 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832474 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 19:12:25 +0000 (19:12 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832472 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 19:10:28 +0000 (19:10 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832471 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 19:08:42 +0000 (19:08 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832470 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 18:34:20 +0000 (18:34 +0000)]
Not a showstopper.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832467 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 29 May 2018 18:33:26 +0000 (18:33 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832466 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 May 2018 18:08:46 +0000 (18:08 +0000)]
Checked and voted. Great job Yann!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832465 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 May 2018 20:19:50 +0000 (20:19 +0000)]
Have code and doc consistent.
The SSLRandomSeed builtin, uses 128 bytes of stack, not 1kb of scoreboard data.
(r1832346 in trunk)
See PR 54752
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832347 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 27 May 2018 16:54:26 +0000 (16:54 +0000)]
Propose some easy votes to synch 2.4.x with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832341 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 May 2018 12:26:55 +0000 (12:26 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832335 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 27 May 2018 12:26:09 +0000 (12:26 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832334 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 May 2018 08:55:19 +0000 (08:55 +0000)]
Re-send
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832300 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 May 2018 08:29:11 +0000 (08:29 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832296 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 26 May 2018 08:21:19 +0000 (08:21 +0000)]
backport r1817908 which fixes some example (see PR 61650) + make some cosmetic changes (r1832294 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832295 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 22 May 2018 20:38:26 +0000 (20:38 +0000)]
Easy vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832063 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 22 May 2018 18:57:09 +0000 (18:57 +0000)]
Update proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832056 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 22 May 2018 18:51:04 +0000 (18:51 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832054 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 22 May 2018 11:36:46 +0000 (11:36 +0000)]
Propose backport for PR 62308, and comment about PR 62277.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1832020 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 8 May 2018 13:09:57 +0000 (13:09 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1831179 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 8 May 2018 13:08:38 +0000 (13:08 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1831178 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 2 May 2018 15:33:02 +0000 (15:33 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830776 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 2 May 2018 11:20:28 +0000 (11:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830745 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 May 2018 08:47:08 +0000 (08:47 +0000)]
Propose backport of http2 keepalive restoration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830734 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 29 Apr 2018 22:20:03 +0000 (22:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830524 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 29 Apr 2018 06:06:52 +0000 (06:06 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830491 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 28 Apr 2018 10:08:18 +0000 (10:08 +0000)]
adding backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830423 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Apr 2018 17:35:44 +0000 (17:35 +0000)]
Merge r1828920 from trunk:
PR62186: preserve %<m for ErrorDocument internal redirects
*) core: Preserve the original HTTP request method in the '%<m' LogFormat
when an path-based ErrorDocument is used. PR 62186.
[Micha Lenk <micha lenk.info>]
Submitted By: Micha Lenk
Committed By: covener
Submitted by: covener
Reviewed by: covener, jhriggs, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830248 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Apr 2018 17:34:01 +0000 (17:34 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830247 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Apr 2018 17:33:22 +0000 (17:33 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830246 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Apr 2018 17:31:52 +0000 (17:31 +0000)]
These look like showstoppers to me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1830245 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Apr 2018 16:11:03 +0000 (16:11 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829718 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Apr 2018 16:08:05 +0000 (16:08 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829717 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 20 Apr 2018 21:12:38 +0000 (21:12 +0000)]
Improve highlight and make these doc much more readable.
Use the "c" highlight for API description.
(r1829678 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829679 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 20 Apr 2018 18:02:20 +0000 (18:02 +0000)]
Normalize STATUS history, full month names for non-english readers, 80 columns.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829672 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Riggs [Fri, 20 Apr 2018 16:14:24 +0000 (16:14 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829669 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 14:02:45 +0000 (14:02 +0000)]
+ r1829657.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829658 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 11:19:02 +0000 (11:19 +0000)]
Add r1829645 to ap_rgetline() proposal, resetting Eric's vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829647 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 19 Apr 2018 20:35:21 +0000 (20:35 +0000)]
Fix some formating. (extra '.', missing <code>)
Fix the number of available load balancer scheduler algorithms and add a link to the corresponding module. (lbmethod_heartbeat was missing in the list)
(r1829613 in trunk + some formating (trailing space and alignment) to synch with trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829615 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 Apr 2018 18:38:11 +0000 (18:38 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829599 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Apr 2018 16:51:46 +0000 (16:51 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829576 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 19 Apr 2018 08:09:10 +0000 (08:09 +0000)]
100% guarantee no mistakes in this commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829515 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 19 Apr 2018 08:04:31 +0000 (08:04 +0000)]
100% guarantee no regressions in this patch or your money back.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829514 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 18 Apr 2018 22:36:14 +0000 (22:36 +0000)]
*) mod_remoteip: make proxy-protocol work on HTTP/2 connections.
trunk patch: http://svn.apache.org/r1827196
2.4.x patch: svn merge -c
1827196 ^/httpd/httpd/trunk .
+1: icing, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829486 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Riggs [Wed, 18 Apr 2018 12:21:50 +0000 (12:21 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829440 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 18 Apr 2018 10:00:20 +0000 (10:00 +0000)]
Update my proposal with jhriggs and jailletc36's
suggestions. Reset jhriggs' vote since the patch
changed.
Thanks to both for the help!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829431 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 17 Apr 2018 20:17:04 +0000 (20:17 +0000)]
Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829396 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 17 Apr 2018 20:00:43 +0000 (20:00 +0000)]
These tokens should not be emphasised. (r1829393 in trunk)
Add some quotes arround a string to improve syntax highlight and synch with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829394 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 17 Apr 2018 19:47:05 +0000 (19:47 +0000)]
Explain when the surrounding double quotes arround the expr argument MUST be avoided. (part of r1829390 in trunk)
Remove trailing spaces to synch with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829392 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Riggs [Sat, 14 Apr 2018 14:29:28 +0000 (14:29 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829146 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Apr 2018 14:27:58 +0000 (14:27 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829145 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Apr 2018 14:27:14 +0000 (14:27 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829144 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 14 Apr 2018 10:01:09 +0000 (10:01 +0000)]
Propose patch for PR 62102
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1829127 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Riggs [Thu, 12 Apr 2018 17:07:24 +0000 (17:07 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828993 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Apr 2018 18:52:04 +0000 (18:52 +0000)]
propose PR62186 fix from BZ
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828923 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Riggs [Wed, 11 Apr 2018 12:30:16 +0000 (12:30 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828893 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Apr 2018 09:16:56 +0000 (09:16 +0000)]
Revert r1828882's mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828883 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 11 Apr 2018 09:10:13 +0000 (09:10 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828882 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:43:38 +0000 (15:43 +0000)]
Merge r1827865 from trunk:
Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
Submitted by: jailletc36
Reviewed by: jailletc36, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828745 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:42:55 +0000 (15:42 +0000)]
Merge r1822931, r1827783 from trunk:
* modules/loggers/mod_logio.c (logio_pre_config): Remove pointless
static in optional fn pointer variable declaration.
* modules/ssl/ssl_engine_vars.c (ssl_var_log_config_register):
Likewise.
Fix a potential compiler warning about uninitialized variable.
PR 59821
Submitted by: jorton, jailletc36
Reviewed by: jailletc36, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828744 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:42:14 +0000 (15:42 +0000)]
Merge r1818802, r1818825 from trunk:
mod_dumpio: do nothing below log level TRACE7.
For instance, depending on EnableMMAP/Sendfile configuration, don't split
file brigades to 8K heap buckets upon reading.
mod_dumpio: follow up to r1818802.
Negate APLOGctrace7(c) test!
Also, return DECLINED when nothing is to be done, same result as OK but
possibly more semantically correct.
Submitted by: ylavic
Reviewed by: jailletc36, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828743 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:39:44 +0000 (15:39 +0000)]
Merge r1822931, r1827783 from trunk:
* modules/loggers/mod_logio.c (logio_pre_config): Remove pointless
static in optional fn pointer variable declaration.
* modules/ssl/ssl_engine_vars.c (ssl_var_log_config_register):
Likewise.
Fix a potential compiler warning about uninitialized variable.
PR 59821
Submitted by: jorton, jailletc36
Reviewed by: jailletc36, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828742 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:39:10 +0000 (15:39 +0000)]
Merge r1826973 from trunk:
mod_md: Fix compilation with OpenSSL before version 1.0.2.
Symbol ASN1_TIME_diff is only available for 1.0.2+,
but luckily alternative code we can use is already
available, originally written for the LibreSSL case.
Submitted by: rjung
Reviewed by: rjung, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828741 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:37:44 +0000 (15:37 +0000)]
Merge r1534895, r1534896, r1534914 from trunk:
rotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for
errors.
* support/rotatelogs.c
(post_rotate, doRotate): Switch to using apr_psprintf() with %pm.
Suggested by: rpluem
rotatelogs: Remove another use of a consant length buffer for errors.
* support/rotatelogs.c
(doRotate): Use apr_psprintf() and %pm. Move the destruction of the pool
after we're done with the error message so the error string stays allocated
long enough.
rotatelogs: Remove last constant length error buffer.
* support/rotatelogs.c
(ERRMSGSZ): Remove.
(rotate_status): Remove errbuff member.
(truncate_and_write_error): Accept the error message as an argument.
(doRotate): Shift the pool destruction slightly later and use it to generate
the error message to pass truncate_and_write_error().
(main): In case of write errors create a pool to generate the error message,
since the other pools available may never been freed. Adjust to pass
message directly to truncate_and_write_error().
Submitted by: breser
Reviewed by: rjung, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828739 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:36:59 +0000 (15:36 +0000)]
Merge r1533810, r1533935, r1666417 from trunk:
Add an option to autocreate directories to rotatelogs.
* support/rotatelogs.c
(rotate_config): Remove const from szLogRoot since we'll be passing it to
apr_filepath_merge. Add create_path member.
(usage, dumpConfig): Update to reflect new -d option.
(doRotate): Add code that knows how to create the directories a log file
is going to go into.
(main): Add the -d option and canonicalize the incoming path with
apr_filepath_merge() so that the code in doRotate can work properly.
* docs/man/rotatelogs.8,
docs/manual/programs/rotatelogs.html.en: Update for -d option.
PR: 46669
Submitted by: Philippe Lantin <plantin cobaltgroup.com>
(which was actually a patch written by myself when I worked there)
Tweaked by: breser (ported to trunk and changed option from -p to -d)
Followup to r1533810: Put the rotatelogs docs in the right place.
* docs/man/rotatelogs.8,
docs/manual/programs/rotatelogs.html.en: Remove changes from r1533810.
* docs/manual/programs/rotatelogs.xml: Adjust docs for new -d option.
Choose "-D" instead of "-d" for the rotatelogs
option that creates the path to the log file.
I want to use "-d" for another directory related
option next where (I think) the "directory" "d"
makes more sense.
"-d" has not yet been backported, so changing
to "-D" is not a real compatibility issue.
Submitted by: breser, rjung
Reviewed by: rjung, ylavic, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828738 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:34:20 +0000 (15:34 +0000)]
Merge r1666415, r1780308 from trunk:
Small changes to rotatelogs:
- add "-n num" to help text
- clarify in help text, that "program is invoked"
is the "-p" case
- prevent crash with "-v" (verbose) if no
"-p prog" is used
- add one space for formatting
rotatelogs: fix -n help text
this closes #24
Submitted By: Isaac Boukris <iboukris gmail.com>
Submitted by: rjung, covener
Reviewed by: rjung, ylavic, niq, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828736 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:30:50 +0000 (15:30 +0000)]
Merge r1828390 from trunk:
mod_ssl: Fix merging of proxy SSL context outside <Proxy> sections.
Regression introduced in 2.4.30. PR 62232.
The proxy SSL_CTX was not inherited from the vhost (the only available in
2.4.29) in/for any directory context besides <Proxy>...
Mostly debugged and fixed by Rainer, thanks!
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828735 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:28:53 +0000 (15:28 +0000)]
Merge r1827654, r1827671 from trunk:
copy apr_sockaddr_is_wildcard to maintain 1.4.x support.
CHANGES for r1827654
Submitted by: covener
Reviewed by: covener, ylavic, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828734 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:26:45 +0000 (15:26 +0000)]
backport approvals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828733 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Apr 2018 15:26:17 +0000 (15:26 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828732 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 9 Apr 2018 10:50:38 +0000 (10:50 +0000)]
updated mod_http2 backport proposal, all-in-one
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828700 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 9 Apr 2018 08:03:51 +0000 (08:03 +0000)]
Promote but add a hint that it would be easier
to apply the patches if the final (but older)
rotatelogs patch would also get accepted.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828677 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 9 Apr 2018 07:58:56 +0000 (07:58 +0000)]
Add niq's vote now that "the other bug is fixed
and backported". not really backported, but
accepted.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828676 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 9 Apr 2018 07:57:53 +0000 (07:57 +0000)]
Address comments with v2 patch. Only difference:
removed change for *.html.en file.
The needed change for the xml file was already
included. New, short patch available as v2.
Added niq's vote as indicated by him.
Hope that's OK.
Thanks to jailletc36 for pointing out the
additional svn revision.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828675 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 9 Apr 2018 07:31:32 +0000 (07:31 +0000)]
Fix CHANGES indentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828672 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 9 Apr 2018 07:30:11 +0000 (07:30 +0000)]
mod_ssl: Fix cmake-based build.
modules/md/mod_md.h is now a new public API
also used by other modules (currently mod_ssl),
so it must be in the include path. It was
missing for cmake builds.
Note that this change does not yet enable building
mod_md itself using cmake. That part is still
missing.
CTR (cmake builds only).
Backport of r1828669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828670 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 8 Apr 2018 19:16:10 +0000 (19:16 +0000)]
Some new easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828659 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Apr 2018 16:35:44 +0000 (16:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828652 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Apr 2018 16:34:49 +0000 (16:34 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828651 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Apr 2018 21:04:16 +0000 (21:04 +0000)]
Add some spaces that were skipped when r1684524 from trunk has been backported in 2.4.x in r1684525.
(in order to synch 2.4.x and trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828619 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Apr 2018 05:19:06 +0000 (05:19 +0000)]
Remove an extra '>'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828585 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 Apr 2018 08:23:07 +0000 (08:23 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828495 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 Apr 2018 08:06:56 +0000 (08:06 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828494 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 5 Apr 2018 21:15:20 +0000 (21:15 +0000)]
Small comments on doc issues
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828479 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Apr 2018 13:32:12 +0000 (13:32 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828432 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Apr 2018 13:30:41 +0000 (13:30 +0000)]
Votes, promotions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828431 13f79535 -47bb-0310-9956-
ffa450edef68