]>
granicus.if.org Git - apache/log
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
Luca Toscano [Wed, 10 Feb 2016 22:41:08 +0000 (22:41 +0000)]
Improved version of the mod_event's doc page.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729748 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 9 Feb 2016 23:09:24 +0000 (23:09 +0000)]
Add APLOGNO, first chunk (those that were
detected by coccinelle).
There are some more but they are easier to
backport once these here are applied.
Backport of r1725392, r1725394, r1725395
and r1725468 from trunk.
Submitted by: rjung
Reviewed by: jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729495 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Feb 2016 22:14:45 +0000 (22:14 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729485 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Feb 2016 12:56:24 +0000 (12:56 +0000)]
add catch from Yann, also check in some votes I never committed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729375 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 8 Feb 2016 22:06:21 +0000 (22:06 +0000)]
add h2_filter.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1729279 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Feb 2016 16:27:31 +0000 (16:27 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728985 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Feb 2016 16:26:46 +0000 (16:26 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728984 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Feb 2016 17:56:37 +0000 (17:56 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728861 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Feb 2016 17:50:08 +0000 (17:50 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728859 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 4 Feb 2016 20:03:59 +0000 (20:03 +0000)]
Remove @jim comment. He has voted again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728551 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Feb 2016 19:26:41 +0000 (19:26 +0000)]
Merge r1726888 from trunk:
Fix some duplicate definitions
Submitted by: mrumph
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728543 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Feb 2016 19:26:00 +0000 (19:26 +0000)]
Merge r1725445 from trunk:
No need to search twice for the same value.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728541 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Feb 2016 19:25:20 +0000 (19:25 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728540 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Feb 2016 19:24:39 +0000 (19:24 +0000)]
some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728539 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Feb 2016 19:23:24 +0000 (19:23 +0000)]
Put in a placeholder
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728538 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Feb 2016 19:21:58 +0000 (19:21 +0000)]
Not really needed to backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728537 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 3 Feb 2016 19:56:38 +0000 (19:56 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728356 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 3 Feb 2016 19:45:47 +0000 (19:45 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728354 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 2 Feb 2016 17:00:26 +0000 (17:00 +0000)]
merged patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728158 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 2 Feb 2016 11:11:33 +0000 (11:11 +0000)]
Resolves comment about how regex matches, at
http://httpd.apache.org/docs/current/mod/mod_rewrite.html#comments_thread
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728084 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 2 Feb 2016 10:53:37 +0000 (10:53 +0000)]
Fix weird indentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728080 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 2 Feb 2016 09:51:49 +0000 (09:51 +0000)]
Rebuild All The Things.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728061 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 2 Feb 2016 09:50:10 +0000 (09:50 +0000)]
mod_rewrite doc enhancements from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728060 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 1 Feb 2016 22:33:57 +0000 (22:33 +0000)]
Backporting documentation changes from trunk related to mod_cgi/cgid and mod_deflate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1728020 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Jan 2016 16:50:05 +0000 (16:50 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727730 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Jan 2016 16:49:19 +0000 (16:49 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727729 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 22:01:02 +0000 (22:01 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727649 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 22:00:16 +0000 (22:00 +0000)]
Fix examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727648 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 21:51:15 +0000 (21:51 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727645 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 21:49:37 +0000 (21:49 +0000)]
Take into account an old comment from Thomas.
Add an example using regex
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727644 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 20:18:09 +0000 (20:18 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727636 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 20:17:45 +0000 (20:17 +0000)]
Small visual tweak
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727635 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 19:53:47 +0000 (19:53 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727628 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 29 Jan 2016 19:52:15 +0000 (19:52 +0000)]
Fix doc as spotted by Shane Roberts in online doc
+ synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727627 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 29 Jan 2016 15:48:04 +0000 (15:48 +0000)]
Fix proposal, restart vote.
Thanks Stefan.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727602 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 13:44:53 +0000 (13:44 +0000)]
adding missing change for APLOGNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727585 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 13:41:42 +0000 (13:41 +0000)]
proposing backport of pre_close_connection hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727584 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 10:05:47 +0000 (10:05 +0000)]
regresssions as test parse debug log
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727507 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 09:57:58 +0000 (09:57 +0000)]
disable any openssl use until configure fix is backported, linking gets messed up when multiple places have openssl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727505 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 09:22:55 +0000 (09:22 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727503 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 29 Jan 2016 09:21:19 +0000 (09:21 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727502 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 28 Jan 2016 20:42:24 +0000 (20:42 +0000)]
Backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727434 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:44:36 +0000 (16:44 +0000)]
proposing APACHE_CHECK_OPENSSL twice invocation fix for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727403 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:29:47 +0000 (16:29 +0000)]
backport of r1718514,
1721313
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727399 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:21:27 +0000 (16:21 +0000)]
missed author
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727397 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:19:10 +0000 (16:19 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727396 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:13:54 +0000 (16:13 +0000)]
backport of r1723122,
1723143
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727393 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 Jan 2016 16:12:23 +0000 (16:12 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727392 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 Jan 2016 14:58:06 +0000 (14:58 +0000)]
Some backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727371 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 28 Jan 2016 12:12:21 +0000 (12:12 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727320 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 28 Jan 2016 12:10:40 +0000 (12:10 +0000)]
Merge r1727317 from trunk:
Update Perl FCGI examples to work with current version of module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727318 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 27 Jan 2016 20:43:19 +0000 (20:43 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1727187 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 27 Jan 2016 06:28:33 +0000 (06:28 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726942 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 27 Jan 2016 06:25:33 +0000 (06:25 +0000)]
Fix typo spotted by noodl in online doc + synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726941 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 Jan 2016 14:34:57 +0000 (14:34 +0000)]
mod_http2: merge r1726798 from trunk.
Fix warnings:
modules/http2/h2_util.c|174| warning: suggest parentheses around ‘+’ in operand of ‘&’
modules/http2/h2_util.c|176| warning: suggest parentheses around ‘+’ in operand of ‘&’
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726801 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jan 2016 14:40:11 +0000 (14:40 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726403 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jan 2016 14:39:09 +0000 (14:39 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726402 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 22 Jan 2016 15:32:09 +0000 (15:32 +0000)]
per ML feedback, make setHandler expression interp
implicit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726234 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 Jan 2016 20:17:14 +0000 (20:17 +0000)]
Fix typo in comment (s/patterm/pattern/).
Backport of r1726086 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726087 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 21 Jan 2016 18:45:54 +0000 (18:45 +0000)]
Fix typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726061 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:52:58 +0000 (16:52 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726020 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:52:20 +0000 (16:52 +0000)]
Merge r1724857 from trunk:
*) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075,
"Error dispatching request", when the cause appears to be
the client closing the connection.
PR58118.
Submitted By: Tobias Adolph <adolph lrz.de>
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@
1726019 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:51:13 +0000 (16:51 +0000)]
Merge r1724847, r1725516 from trunk:
flush errors are TRACE1 in the core output filter now.
Remove APLOGNO after moving log message to
TRACE1 in r1724847.
Submitted by: covener, rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726018 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Jan 2016 16:49:48 +0000 (16:49 +0000)]
Merge r1724656 from trunk:
*) mod_rewrite: Avoid looping on relative substitutions that
result in the same filename we started with. PR 58854.
[Eric Covener]
Previously, the comparison of old and new filename happened before
some prefixes might be added.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1726016 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 21 Jan 2016 13:17:42 +0000 (13:17 +0000)]
propsing ssl timeout fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725942 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 20 Jan 2016 18:04:33 +0000 (18:04 +0000)]
prep
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725768 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 19 Jan 2016 15:58:23 +0000 (15:58 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725554 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 19 Jan 2016 13:42:03 +0000 (13:42 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725518 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 19 Jan 2016 13:41:15 +0000 (13:41 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725517 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:58:52 +0000 (12:58 +0000)]
Merge r1723567 from trunk:
Add common extension "m4a" for MPEG 4 Audio to
mime.types.
As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A
PR: 57895
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725509 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:57:16 +0000 (12:57 +0000)]
Merge r1719257 from trunk:
Do not use the magic string "directory". Use the corresponding global variable as in all other places of the module.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725508 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:56:57 +0000 (12:56 +0000)]
Merge r1719252, r1719254, r1719255, r1720996 from trunk:
Use 'ap_array_str_contains' to simplify code.
Use 'ap_array_str_contains' to simplify code.
Use 'ap_array_str_contains' to simplify code.
Use 'ap_array_str_contains' to simplify code.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725507 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Jan 2016 12:56:11 +0000 (12:56 +0000)]
Merge r1719018, r1719189, r1719190 from trunk:
Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.
Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.
Fix some minor style issue.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1725506 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log