]>
granicus.if.org Git - apache/log
Luca Toscano [Sat, 18 Jun 2016 10:23:01 +0000 (10:23 +0000)]
Added some information to ListenCoresBucketsRatio documentation page already in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748951 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 16:56:47 +0000 (16:56 +0000)]
And we are 2.4.22-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748762 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 16:55:17 +0000 (16:55 +0000)]
Get ready to tag 2.4.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748760 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 16:24:20 +0000 (16:24 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748758 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 12:35:58 +0000 (12:35 +0000)]
Merge r1748653 from trunk:
Fix a potential buffer overflow.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748706 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 12:35:30 +0000 (12:35 +0000)]
prmote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748705 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 12:35:13 +0000 (12:35 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748704 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 16 Jun 2016 09:07:37 +0000 (09:07 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748672 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Jun 2016 06:18:55 +0000 (06:18 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748654 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 16 Jun 2016 01:17:29 +0000 (01:17 +0000)]
duplicate entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748647 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 15 Jun 2016 15:36:11 +0000 (15:36 +0000)]
Voting for r1748379 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748598 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 15 Jun 2016 14:13:06 +0000 (14:13 +0000)]
Propose backport of r1748379 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748585 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 15 Jun 2016 10:06:21 +0000 (10:06 +0000)]
Merge of r1748531 from trunk:
mod_http2: more rigid error handling in DATA frame assembly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748536 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 Jun 2016 08:23:49 +0000 (08:23 +0000)]
Add comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748518 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 Jun 2016 08:21:48 +0000 (08:21 +0000)]
It should.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748517 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 15 Jun 2016 06:22:32 +0000 (06:22 +0000)]
Question
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748500 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 14 Jun 2016 21:34:35 +0000 (21:34 +0000)]
Correct imbalanced #endif I introduced in r1748449
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748469 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 14 Jun 2016 18:44:54 +0000 (18:44 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748450 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 14 Jun 2016 18:41:55 +0000 (18:41 +0000)]
abs: Include OPENSSL_Applink when compiling on Windows, to resolve
failures under Visual Studio 2015 and other mismatched MSVCRT flavors.
PR: 59630
Submitted by: Jan Ehrhardt <phpdev ehrhardt.nl>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748449 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 16:34:14 +0000 (16:34 +0000)]
mod_ssl: Don't enable CRL checks/flags by default.
(follow up/fix to r1748338 committed in 2.4.21)
Submitted by: ylavic
Reviewed by: icing, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748442 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 16:32:41 +0000 (16:32 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748438 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 16:28:33 +0000 (16:28 +0000)]
Propose (when apr-util v1.6 is released).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748437 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 14 Jun 2016 15:25:55 +0000 (15:25 +0000)]
change mod_proxy_http2.dep to use h2_proxy_util.c indtead of h2_util.c
follow-up to r1748429
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748430 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 14 Jun 2016 15:15:52 +0000 (15:15 +0000)]
add mod_proxy_http2 to traditional windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748429 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 14 Jun 2016 10:09:30 +0000 (10:09 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748377 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 14 Jun 2016 09:42:15 +0000 (09:42 +0000)]
Propose fix for 2.4.21 (before release).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748371 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 14 Jun 2016 08:51:31 +0000 (08:51 +0000)]
Merge of r1747550 from trunk:
mod_proxy_http2 no longer shares objects with mod_http2
h2_casecmpstr eliminated, uses backported ap_cstr_casecmp*
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748359 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 00:00:55 +0000 (00:00 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748340 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:48:39 +0000 (23:48 +0000)]
mod_ssl: Add "no_crl_for_cert_ok" flag to SSLCARevocationCheck directive
to opt-in previous behaviour (2.2) with CRLs verification when checking
certificate(s) with no corresponding CRL.
Submitted by: ylavic
Reviewed by: icing, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748338 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:47:34 +0000 (23:47 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748337 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:40:00 +0000 (23:40 +0000)]
mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound
according the number of listeners buckets.
Submitted by: ylavic
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748336 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:38:00 +0000 (23:38 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748335 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:31:21 +0000 (23:31 +0000)]
Add ap_cstr_casecmp[n]() - placeholder of apr_cstr_casecmp[n] functions
for case-insensitive C/POSIX-locale token comparison.
Submitted by: wrowe
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748334 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:29:11 +0000 (23:29 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748333 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:20:20 +0000 (23:20 +0000)]
mod_userdir: Constify and save a few bytes in the conf pool when parsing
"UserDir" directive
Submitted by: jailletc36
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748332 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:18:50 +0000 (23:18 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748331 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:13:53 +0000 (23:13 +0000)]
mod_cache: Fix (max-stale with no '=') and enforce (check integers after '=')
Cache-Control header parsing.
Submitted by: jailletc36
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748330 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:10:53 +0000 (23:10 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748329 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:08:08 +0000 (23:08 +0000)]
core: Add -DDUMP_INCLUDES configtest to show the Include tree.
Example:
Included configuration files:
(*) .../conf/httpd.conf
(517) .../conf/extra/proxy-html.conf
(91) /dev/null
Submitted by: Jacob Champion <champion.pxi gmail.com>
Reviewed by: covener, gsmith, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748327 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:01:58 +0000 (23:01 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748326 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 22:55:22 +0000 (22:55 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748325 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 22:53:08 +0000 (22:53 +0000)]
mod_proxy_fcgi: Avoid passing a filename of proxy:fcgi:// as
SCRIPT_FILENAME to a FastCGI server. PR59618.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748324 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 22:52:36 +0000 (22:52 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748323 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Jun 2016 13:04:17 +0000 (13:04 +0000)]
Merge r1747946 from trunk:
mod_dav: Add dav_get_provider_name() function to obtain the name
of the provider from mod_dav.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748215 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Jun 2016 13:00:34 +0000 (13:00 +0000)]
Merge r1730723 from trunk:
Add 451... Needed to adjust RESPONSE_CODES which
was not in the provided patch
BUGZ# 58985
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748212 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Jun 2016 13:00:09 +0000 (13:00 +0000)]
Merge r1744458, r1744459 from trunk:
Avoid memory allocation before making sure that this handler can handle the URL
Avoid memory allocation before making sure that this handler can handle the URL
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748210 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 13 Jun 2016 12:40:38 +0000 (12:40 +0000)]
two quick votes/promotions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748200 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 13 Jun 2016 12:26:40 +0000 (12:26 +0000)]
fix url, vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748196 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 Jun 2016 12:12:37 +0000 (12:12 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748190 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 13 Jun 2016 09:58:07 +0000 (09:58 +0000)]
Merge of r1747735 from trunk:
mod_proxy_http2: properly care for HTTP2 flow control of the frontend
connection is HTTP/1.1. [Patch supplied by Evgeny Kotkov]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748168 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 Jun 2016 12:36:37 +0000 (12:36 +0000)]
Spelling is important.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747990 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 Jun 2016 12:35:45 +0000 (12:35 +0000)]
Propose and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747989 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 Jun 2016 12:32:13 +0000 (12:32 +0000)]
Propose/vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747988 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jun 2016 15:19:48 +0000 (15:19 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747902 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jun 2016 15:18:39 +0000 (15:18 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747901 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 11 Jun 2016 15:18:32 +0000 (15:18 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747900 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 10 Jun 2016 22:54:28 +0000 (22:54 +0000)]
propose proxy_Fcgi fixup--This line, and those below, will be ignored--
M STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747811 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 10 Jun 2016 22:47:34 +0000 (22:47 +0000)]
propose -DDUMP_INCLUDES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747809 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 10 Jun 2016 22:01:40 +0000 (22:01 +0000)]
Fix r1744951 which introduced a tab when r1610674 has been backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747806 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 10 Jun 2016 21:35:35 +0000 (21:35 +0000)]
Revert r1728060.
Corresponding code has not been merged (see r1664565 and r1664575)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747804 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 10 Jun 2016 14:24:27 +0000 (14:24 +0000)]
Merge r1745034 from trunk:
PR59612: Print the ap_expr() error message when an expression cannot
be evaluated in forward-dns provider.
Submitted By: Tianyin Xu <tixu cs.ucsd.edu>
Committed By: covener
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747717 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 10 Jun 2016 14:23:48 +0000 (14:23 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747716 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 10 Jun 2016 14:23:23 +0000 (14:23 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747715 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 10 Jun 2016 08:58:27 +0000 (08:58 +0000)]
h2 upgrade: withdrawing backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747668 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 10 Jun 2016 02:37:32 +0000 (02:37 +0000)]
Credit where credit is due
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747624 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 9 Jun 2016 20:25:14 +0000 (20:25 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747592 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 9 Jun 2016 10:38:10 +0000 (10:38 +0000)]
Merge of r1747531 from trunk:
mod_http2: improved cleanup of connection/streams/tasks to always
have deterministic order regardless of event initiating it. Addresses
reported crashes due to memory read after free issues.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747532 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 9 Jun 2016 02:45:16 +0000 (02:45 +0000)]
Pick up a serious and cosmetic fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747485 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 9 Jun 2016 01:55:49 +0000 (01:55 +0000)]
Propose a rational backport.
Overthinking our interaction with APR is a deep hole we don't want to go down.
For 2.next, of course we will throw away all this code, but this is a stopgap
with a future #define compatibility wrapper once we get that far.
Now, with extra history...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747479 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 7 Jun 2016 11:29:51 +0000 (11:29 +0000)]
Merge r1746988,r1747170 from trunk:
mod_http2: backport of 1.5.7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747194 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 7 Jun 2016 09:59:27 +0000 (09:59 +0000)]
ap_casecmpstr strikes again...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747181 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 7 Jun 2016 09:10:49 +0000 (09:10 +0000)]
Translated to match english revision.
Reviewed. build the html file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747173 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Jun 2016 22:00:05 +0000 (22:00 +0000)]
Fix example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747086 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Jun 2016 21:46:52 +0000 (21:46 +0000)]
Fix compatibility note.
Synch with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747085 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 6 Jun 2016 21:33:10 +0000 (21:33 +0000)]
Update proposal.
(r1656259 has introduced many updates. It should be backported before trying to get r1744460)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747079 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 6 Jun 2016 20:23:24 +0000 (20:23 +0000)]
Correct the behavior and interaction between SSLProxyCheckPeer[CN|Name],
such that disabling either disables both, and that enabling either will
trigger the more comprehensive SSLProxyCheckPeerName behavior.
Only a single configuration remains to enable the legacy behavior, which
is to explicitly disable SSLProxyCheckPeerName and enable SSLProxyCheckPeerCN.
Changes to the proxy config directives leads us to a different 2.4 fix...
https://github.com/wrowe/patches/blob/master/fix_proxy_check_peer-2.4.x.patch
Backports:
1746647
Reviewed by: wrowe, icing, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747069 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 6 Jun 2016 19:11:57 +0000 (19:11 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747058 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 6 Jun 2016 19:11:38 +0000 (19:11 +0000)]
Merge r1506474 from trunk:
* server/core.c (set_document_root): Improve error message for
inaccessible docroot.
Submitted by: jorton
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747057 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 6 Jun 2016 19:11:20 +0000 (19:11 +0000)]
Merge r1744206 from trunk:
mod_rewrite: adding h2:// and h2c:// proxy schemes to absolute uri detection, patch by Evgeny Kotkov
Submitted by: icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747056 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 6 Jun 2016 19:11:04 +0000 (19:11 +0000)]
Merge r1744980 from trunk:
Save a few bytes in the conf pool.
The directive's names don't need to be duplicated in this pool when parsing the configuration file.
Either they match a known directive name and we can use it directly if needed. Otherwise, it is still possible to make a copy afterwards.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747055 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 6 Jun 2016 19:10:42 +0000 (19:10 +0000)]
Merge r1737476 from trunk:
Add the <!--#comment ... --> syntax.
Idea from Rob.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747054 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Jun 2016 18:33:28 +0000 (18:33 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747050 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jun 2016 18:28:24 +0000 (18:28 +0000)]
move item out of the "being worked" section, it was committed
directly to that section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747049 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jun 2016 18:21:38 +0000 (18:21 +0000)]
one more promo, fix whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747047 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jun 2016 18:08:21 +0000 (18:08 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747046 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jun 2016 18:07:17 +0000 (18:07 +0000)]
vote, shrink proposal based on jailletc36's comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747045 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 6 Jun 2016 15:08:01 +0000 (15:08 +0000)]
Showstopper to patch adoption, along with a more general objection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747027 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 14:20:49 +0000 (14:20 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747016 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 14:02:50 +0000 (14:02 +0000)]
only vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747010 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 14:01:30 +0000 (14:01 +0000)]
reversal of r1747004 bc unwanted changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747009 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 13:58:26 +0000 (13:58 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1747004 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 13:46:34 +0000 (13:46 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746999 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 13:45:58 +0000 (13:45 +0000)]
Merge of r1733537 from trunk:
ab: caseless matching for http heaers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746997 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 13:43:37 +0000 (13:43 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746996 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Jun 2016 13:29:27 +0000 (13:29 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746992 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 6 Jun 2016 12:51:38 +0000 (12:51 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746987 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Jun 2016 15:23:15 +0000 (15:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746929 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Jun 2016 15:20:20 +0000 (15:20 +0000)]
trunk has providers for customlog/globallog, 2.4.x doesn't.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746928 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Jun 2016 08:31:29 +0000 (08:31 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746874 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Jun 2016 08:06:46 +0000 (08:06 +0000)]
Backport r1746754
Synch with trunk, merge r1628690
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1746871 13f79535 -47bb-0310-9956-
ffa450edef68