]>
granicus.if.org Git - apache/log
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
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