]>
granicus.if.org Git - apache/log
William A. Rowe Jr [Thu, 23 Jun 2016 15:55:54 +0000 (15:55 +0000)]
Pick up a most worthwhile backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749928 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Jun 2016 15:33:33 +0000 (15:33 +0000)]
Revert modules/core/config.m4 from r1749922, 2.4.x branch back to r1749919
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749923 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Jun 2016 15:31:00 +0000 (15:31 +0000)]
Revert r1749920, meant to apply this to trunk/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749922 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Jun 2016 15:28:28 +0000 (15:28 +0000)]
Promote any static to a shared module if the required dependency is dynamic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749920 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 23 Jun 2016 06:07:40 +0000 (06:07 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749830 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 23 Jun 2016 06:06:04 +0000 (06:06 +0000)]
Fix typo (r1749828 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749829 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 22:22:16 +0000 (22:22 +0000)]
Ack unindicted co-conspirator's contributions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749792 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 21:55:01 +0000 (21:55 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749788 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Jun 2016 21:01:02 +0000 (21:01 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749787 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Jun 2016 20:59:56 +0000 (20:59 +0000)]
Synch 2.4 and trunk doc (backport r1742073)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749786 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Jun 2016 20:55:47 +0000 (20:55 +0000)]
Add missing mod_proxy_http2.xml.meta file.
Generate mod_proxy_http2 HTML files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749784 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 20:03:45 +0000 (20:03 +0000)]
Note change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749775 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 20:00:39 +0000 (20:00 +0000)]
Merge r1749659, r1749678 from trunk:
Simplify, and correct the dependency handling of mod_proxy_hcheck
Cause missing mod_watchdog to 'unset' the --enable-proxy default, rather than
disable the module. This forces the module logic to emit a warning of the
missing dependency; changes the output from
checking whether to enable mod_proxy_hcheck... no
to
configure: WARNING: "mod_watchdog is disabled but required for mod_proxy_hcheck"
checking whether to enable mod_proxy_hcheck... no (disabled)
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749774 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 19:57:52 +0000 (19:57 +0000)]
Merge r1749658 from trunk:
Support multiple module dependencies for the final prereq argument to the
APACHE_MODULE macro, as a comma separated list, e.g.
APACHE_MODULE(proxy_http2, [...], [proxy,http2])
will evaluate the availability of mod_proxy, followed by mod_http2
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749773 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Jun 2016 19:35:17 +0000 (19:35 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749764 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 22 Jun 2016 19:28:22 +0000 (19:28 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749759 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 17:16:13 +0000 (17:16 +0000)]
note combined patch from email
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749746 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 14:31:19 +0000 (14:31 +0000)]
vote...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749713 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 13:30:24 +0000 (13:30 +0000)]
Merge of r1749695 from trunk:
mod_http2: fixing APLOG_NO overdose and some log levels
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749698 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Jun 2016 13:18:13 +0000 (13:18 +0000)]
Merge r1749693 from trunk:
assign IDs to new AH*'s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749694 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Jun 2016 13:16:40 +0000 (13:16 +0000)]
Merge r1749688 from trunk:
spatch some AH* IDs to pick up the new INFO level messages,
also hit old DEBUG messages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749692 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 13:11:03 +0000 (13:11 +0000)]
Merge of r1749505, r1749676 from trunk:
mod_proxy_http2: fixed retry behaviour when proxy engine needs to retry its base request on a new connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749684 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 13:02:10 +0000 (13:02 +0000)]
Refresh proposal with more specific diagnostics for the user of ./configure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749679 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 12:33:57 +0000 (12:33 +0000)]
Propose for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749660 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 22 Jun 2016 10:43:51 +0000 (10:43 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749651 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 22 Jun 2016 10:43:34 +0000 (10:43 +0000)]
Add mod-proxy DNS caching information to the documentation (follow up from users@)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749650 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 12:29:00 +0000 (12:29 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749502 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 12:28:32 +0000 (12:28 +0000)]
Merge of r1748888 from trunk:
If enable_proxy_hcheck is unset handle it like other proxy modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749501 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 12:25:47 +0000 (12:25 +0000)]
vote and accept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749499 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 21 Jun 2016 12:05:07 +0000 (12:05 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749497 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Jun 2016 11:51:48 +0000 (11:51 +0000)]
configure patch for hcheck
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749495 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:15:17 +0000 (13:15 +0000)]
and we are 2.4.23-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749336 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:12:33 +0000 (13:12 +0000)]
Prep for tagging 2.4.22
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749334 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:11:20 +0000 (13:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749332 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:10:06 +0000 (13:10 +0000)]
Backport
Merge r1749151 from trunk:
mod_http2: fix for request abort when connections drops, introduced in 1.5.8
Submitted by: icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749331 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 12:23:54 +0000 (12:23 +0000)]
Backport and note non-release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749320 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jun 2016 14:04:19 +0000 (14:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749040 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jun 2016 14:03:17 +0000 (14:03 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749038 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 18 Jun 2016 10:23:16 +0000 (10:23 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748952 13f79535 -47bb-0310-9956-
ffa450edef68
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