]>
granicus.if.org Git - apache/log
Rich Bowen [Thu, 3 Mar 2016 01:13:25 +0000 (01:13 +0000)]
rewritemap doc improvements from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733403 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 2 Mar 2016 14:02:52 +0000 (14:02 +0000)]
time to yank, still working on the issue with the cpanel guys,
but the first fix is bad.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733292 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:52:20 +0000 (13:52 +0000)]
*) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was
backported in r1729495 but without this "server/core.c" change)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733291 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:51:32 +0000 (13:51 +0000)]
Merge r1732954 from trunk:
mod_proxy: add missing APLOGNO()s.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733289 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:50:45 +0000 (13:50 +0000)]
ez promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733288 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:50:19 +0000 (13:50 +0000)]
ez
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733287 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:48:35 +0000 (13:48 +0000)]
Note new patch which addresses the coupla empty LOGNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733286 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:23:30 +0000 (13:23 +0000)]
note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733283 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:22:07 +0000 (13:22 +0000)]
Merge r1729930, r1729931 from trunk:
hostname: Test and log useragent_host per-request across various modules,
including the scoreboard, expression and rewrite engines, setenvif,
authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.
PR55348 [William Rowe]
This is the complete change set which applies cleanly to 2.4.x as well,
the server/scoreboard.c will follow, which does not apply due to drift.
A rather ugly patch since the code was refactored recently to exclude
the simple patch for 2.4.x, illustrated below.
Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
but other 2.5.0-dev specific changes may still be needed on trunk.
--- server/scoreboard.c (revision
1729907 )
+++ server/scoreboard.c (working copy)
@@ -491,9 +491,8 @@
ws->conn_bytes = 0;
}
if (r) {
- const char *client = ap_get_remote_host(c, r->per_dir_config,
- REMOTE_NOLOOKUP, NULL);
- if (!client || !strcmp(client, c->client_ip)) {
+ const char *client;
+ if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
}
else {
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733282 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Mar 2016 13:20:24 +0000 (13:20 +0000)]
Merge r1729929 from trunk:
Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).
This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization. Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.
(Fixed compilation issues noted by Ranier, applies to 2.4.x trunk,
modulo CHANGES and ap_mmn.h)
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733281 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Mar 2016 13:10:05 +0000 (13:10 +0000)]
backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733279 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Mar 2016 13:05:01 +0000 (13:05 +0000)]
backport of PR 59019 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733278 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Mar 2016 12:54:07 +0000 (12:54 +0000)]
mod_http2: fixing max conneciton workers when H2MaxWorkers is not configured
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733276 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Mar 2016 12:25:43 +0000 (12:25 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733270 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Mar 2016 12:20:24 +0000 (12:20 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733268 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Mar 2016 11:21:28 +0000 (11:21 +0000)]
backport of mod_http2 v1.3.2 minus event conn-status fixup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733259 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 2 Mar 2016 00:10:06 +0000 (00:10 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733200 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 23:10:48 +0000 (23:10 +0000)]
people.a.o has just died, welcome home :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733185 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 23:01:29 +0000 (23:01 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733183 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 21:34:15 +0000 (21:34 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733159 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 21:23:47 +0000 (21:23 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733156 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 20:34:14 +0000 (20:34 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733136 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 15:40:25 +0000 (15:40 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733090 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 14:08:33 +0000 (14:08 +0000)]
Revive stalled work with comments addressed, resetting votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733074 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Mar 2016 13:46:36 +0000 (13:46 +0000)]
Committed revision
1733066 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733067 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Mar 2016 13:46:22 +0000 (13:46 +0000)]
Merge r1726881, r1727111 from trunk:
* Introduce SSLOCSPProxyURL in order to do OCSP requests via a HTTP proxy.
Documentation to follow.
* Change entry and documentation for SSLOCSPProxyURL
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733066 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 12:52:29 +0000 (12:52 +0000)]
Improve proposal per Jim feedbacks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733058 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 1 Mar 2016 10:11:33 +0000 (10:11 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733027 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 1 Mar 2016 10:09:14 +0000 (10:09 +0000)]
property fixup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733025 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 1 Mar 2016 06:10:13 +0000 (06:10 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732998 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 1 Mar 2016 06:08:03 +0000 (06:08 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732997 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 02:07:36 +0000 (02:07 +0000)]
Follow up to r1727393: add missing (voted) change from trunk's r1723284.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732990 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 1 Mar 2016 01:33:55 +0000 (01:33 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732988 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Feb 2016 23:16:01 +0000 (23:16 +0000)]
Vote, promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732969 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Feb 2016 22:57:50 +0000 (22:57 +0000)]
Use original trunk commit which works.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732965 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Feb 2016 22:49:29 +0000 (22:49 +0000)]
Propose missing APLOGNO()s backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732963 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 29 Feb 2016 20:07:12 +0000 (20:07 +0000)]
comment mod_systemd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732940 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Feb 2016 14:56:33 +0000 (14:56 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732749 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Feb 2016 14:55:46 +0000 (14:55 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732748 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 Feb 2016 07:23:49 +0000 (07:23 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732692 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Feb 2016 17:49:48 +0000 (17:49 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732659 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Feb 2016 17:48:49 +0000 (17:48 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732658 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 10:42:12 +0000 (10:42 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732281 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 10:40:16 +0000 (10:40 +0000)]
addded proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732279 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 10:28:02 +0000 (10:28 +0000)]
uodate after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732276 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 10:27:27 +0000 (10:27 +0000)]
merging pre_close_connection hook, prep_lingering_close and ap_update_child() additions from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732275 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 09:58:55 +0000 (09:58 +0000)]
assuming I understood the 2 votes reset correctly, accepting the pre_close_connection hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732272 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 09:00:03 +0000 (09:00 +0000)]
update after merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732267 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 08:59:36 +0000 (08:59 +0000)]
mod_proxy_wstunnel, mod_proxy_connect: Use the correct pool and allocator
lifetime when sending brigades and buckets down the filter chain
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732266 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 25 Feb 2016 08:58:09 +0000 (08:58 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732265 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Feb 2016 13:50:09 +0000 (13:50 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732159 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Feb 2016 12:07:33 +0000 (12:07 +0000)]
Add images
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732104 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Feb 2016 12:04:31 +0000 (12:04 +0000)]
Howto update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1732097 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 22 Feb 2016 07:18:35 +0000 (07:18 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731595 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 22 Feb 2016 07:18:19 +0000 (07:18 +0000)]
Added more references to mod_proxy_* doc about websockets and load balancing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731594 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Feb 2016 09:16:05 +0000 (09:16 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731354 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Feb 2016 09:05:20 +0000 (09:05 +0000)]
Add V.34 option for ModemStandard directive
("i-was-rich-and-got-a-leased-line" is still undocumented, but do we really to document it?)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731349 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Feb 2016 07:00:58 +0000 (07:00 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731336 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Feb 2016 06:52:50 +0000 (06:52 +0000)]
Add compatibility notes.
Synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731334 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 19 Feb 2016 14:57:35 +0000 (14:57 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731252 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 19 Feb 2016 14:57:06 +0000 (14:57 +0000)]
Backporting mod_event's doc updates from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731251 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 19 Feb 2016 08:05:22 +0000 (08:05 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731195 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 19 Feb 2016 08:05:08 +0000 (08:05 +0000)]
Improved sections doc for Bug: 58789
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731194 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Feb 2016 15:10:00 +0000 (15:10 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731088 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Feb 2016 15:07:33 +0000 (15:07 +0000)]
Merge r1727842 from trunk:
mod_heartmonitor: No need to search twice for the same value + fix some style
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731086 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Feb 2016 15:07:06 +0000 (15:07 +0000)]
Merge r1725485 from trunk:
Added many log numbers to log statements that
had none.
Those were not detected by the coccinelle script.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731085 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Feb 2016 15:06:27 +0000 (15:06 +0000)]
Merge r1722154, r1722701 from trunk:
Update w/ better logging
Fix sparse warnings introduced in r1722154 (inconsistent indenting)
Submitted by: jim, jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731083 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Feb 2016 15:05:46 +0000 (15:05 +0000)]
Merge r1721899 from trunk:
mod_cache_socache: Fix a possible cached entity body corruption when it
is received from an origin server in multiple batches and forwarded by
mod_proxy.
Upstream buckets should be setaside when saving response body (store_body),
but since those will finally be flatten in the cache buffer (commit_entity),
let's save them directly into the buffer to avoid heap allocation(s) and
the final copy.
Reported by: Mike Pastore <mike oobak.org>
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731082 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 18 Feb 2016 15:04:17 +0000 (15:04 +0000)]
Merge r1653941, r1653978, r1656225, r1686853, r1686856 from trunk:
mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.
Use unsigned bit fields.
mod_alias: follow up to r1653941.
Fill empty APLOGNO().
mod_alias: follow up to r1653941.
Limit Redirect expressions to directory (Location) context
and redirect statuses (implicit or explicit).
mod_alias: follow up to r1686853.
Factorize code (no functional change).
Submitted by: minfrin, ylavic, ylavic, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1731081 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 17 Feb 2016 20:27:07 +0000 (20:27 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730933 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 17 Feb 2016 20:24:06 +0000 (20:24 +0000)]
* Vote and comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730932 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 17 Feb 2016 13:21:49 +0000 (13:21 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730829 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Feb 2016 13:20:47 +0000 (13:20 +0000)]
Move this to being "worked".... maybe "stalled" might
be more accurate??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730685 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Feb 2016 13:19:01 +0000 (13:19 +0000)]
Merge r1588330 from trunk:
Prevent an external proxy from presenting an internal proxy
in mod_remoteip.c. PR 55962.
Submitted by: mrumph
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730684 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Feb 2016 13:17:21 +0000 (13:17 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730683 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Feb 2016 13:16:53 +0000 (13:16 +0000)]
A bunch o' votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730682 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 15 Feb 2016 17:12:10 +0000 (17:12 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730573 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 13 Feb 2016 17:47:48 +0000 (17:47 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730256 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Feb 2016 15:10:07 +0000 (15:10 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730237 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Feb 2016 14:41:58 +0000 (14:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730219 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Feb 2016 14:37:56 +0000 (14:37 +0000)]
XML update and typo in mod/mod_rewrite.xml.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730218 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Feb 2016 17:51:32 +0000 (17:51 +0000)]
Feather
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730080 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 12 Feb 2016 16:23:17 +0000 (16:23 +0000)]
Leave out mention of something we won't try on a released branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730057 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Feb 2016 15:55:43 +0000 (15:55 +0000)]
backport props... simple
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730048 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Feb 2016 13:48:52 +0000 (13:48 +0000)]
ptr to 2.4 patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1730024 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 12 Feb 2016 09:58:32 +0000 (09:58 +0000)]
updating backport proposal of pre_close_connection and scoreboard changes, resetting votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729967 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 12 Feb 2016 07:41:06 +0000 (07:41 +0000)]
Documentation rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729950 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 12 Feb 2016 07:39:56 +0000 (07:39 +0000)]
Removed confusing lines in mod_event's documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729949 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 12 Feb 2016 01:24:44 +0000 (01:24 +0000)]
Submitted for consideration...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729932 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 11 Feb 2016 23:16:23 +0000 (23:16 +0000)]
followups to
1729876 :
- fix relase # in MMN
- compatibility is for expression only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729922 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Feb 2016 19:09:39 +0000 (19:09 +0000)]
Need status on this backport...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729877 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Feb 2016 19:06:16 +0000 (19:06 +0000)]
Merge r1725149, r1726233, r1729374, r1729374 from trunk:
allow expressions to be used in SetHandler. Opt-in with expr= prefix.
from feedback, assume all parameters to SetHandler are expressions.
I couldnt come up with a plausible handler name that was an
invalid expression.
1726233 temporarily broke UDS r->handler case sensitivity
1726233 temporarily broke UDS r->handler case sensitivity
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729876 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Feb 2016 19:05:07 +0000 (19:05 +0000)]
Merge r1727544 from trunk:
* Ensure that proto_num and protocol is set in another "error out early" edge
case. This can happen with invalid CONNECT requests as described in the PR.
PR: 58929
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729875 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Feb 2016 19:03:54 +0000 (19:03 +0000)]
Merge r1725940 from trunk:
handling TIMEUP on SSL inputs by allowing later retries
Submitted by: icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729874 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Feb 2016 19:03:04 +0000 (19:03 +0000)]
Merge r1717816 from trunk:
Fix missing Upgrade headers on OPTION * requests, PR58688
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729873 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Feb 2016 19:02:29 +0000 (19:02 +0000)]
Merge r1725325 from trunk:
* Since r1724820 two modules, mod_http2 and mod_ssl, call APACHE_CHECK_OPENSSL,
with mod_http2 doing it first. Because the result of APACHE_CHECK_OPENSSL
is cached this causes MOD_LDFLAGS and MOD_CFLAGS to remain unset for mod_ssl
which in turn causes it not to be linked against Openssl which means that
mod_ssl cannot be loaded if the Openssl libs haven't been loaded by other means
already.
Fix this by caching the values for MOD_LDFLAGS and MOD_CFLAGS created during
the first run and set them in the cached case.
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729872 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 11 Feb 2016 18:27:42 +0000 (18:27 +0000)]
Vote on mod_remoteip proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729870 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 11 Feb 2016 17:38:24 +0000 (17:38 +0000)]
Finally reviewed in detail, this should be backported to close PR 55962
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729868 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 11 Feb 2016 16:42:19 +0000 (16:42 +0000)]
add date from announcement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729856 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 10 Feb 2016 22:45:27 +0000 (22:45 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729750 13f79535 -47bb-0310-9956-
ffa450edef68