]>
granicus.if.org Git - apache/log
Rich Bowen [Sat, 28 May 2016 14:43:09 +0000 (14:43 +0000)]
auth_form example from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745880 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 27 May 2016 21:30:40 +0000 (21:30 +0000)]
didn't think about CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745819 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 May 2016 20:46:16 +0000 (20:46 +0000)]
Improve example layout
Synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745815 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 May 2016 20:22:49 +0000 (20:22 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745809 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 May 2016 20:22:07 +0000 (20:22 +0000)]
Fix broken link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745808 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 May 2016 20:08:37 +0000 (20:08 +0000)]
Synch with trunk
merge r1745711 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745806 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 May 2016 20:07:06 +0000 (20:07 +0000)]
Synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745805 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 27 May 2016 15:55:01 +0000 (15:55 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745768 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 26 May 2016 08:52:09 +0000 (08:52 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745582 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 25 May 2016 16:29:59 +0000 (16:29 +0000)]
_setargv will not compile on _MSC_VER > 1700 MS documentation's example simply does not work. Disabe for now, Apachemonitor still works.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745517 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 24 May 2016 11:42:26 +0000 (11:42 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745344 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 24 May 2016 11:41:57 +0000 (11:41 +0000)]
Adding a note to mod_proxy documentation to clarify DNS resolution with origin servers. Follow up from a question on users@. Backported from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745343 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 May 2016 14:58:58 +0000 (14:58 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745213 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 May 2016 14:57:28 +0000 (14:57 +0000)]
2.4.x only: replace() not backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745211 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 May 2016 14:56:57 +0000 (14:56 +0000)]
Merge r1745206 from trunk:
add a -R example, I had to ask for help to figure out the single quotes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745210 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 23 May 2016 12:44:02 +0000 (12:44 +0000)]
merge of r1745175 from trunk:
mod_http2: fix for possible null pointer deref on aborted bucket beam.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745176 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 23 May 2016 10:55:29 +0000 (10:55 +0000)]
mod_http2: backport of v1.5.6 plus mod_proxy_http2 dsp support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745137 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 22 May 2016 14:48:52 +0000 (14:48 +0000)]
auth_digest doc improvement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745061 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 May 2016 14:08:20 +0000 (14:08 +0000)]
Move proposal to the right section.
I think that the latest proposal from jorton should also be moved.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745049 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 22 May 2016 12:12:04 +0000 (12:12 +0000)]
two quick fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745035 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 May 2016 07:52:23 +0000 (07:52 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1745020 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 May 2016 21:06:06 +0000 (21:06 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744986 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 May 2016 21:04:14 +0000 (21:04 +0000)]
Clarify the file-group syntax.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744985 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 May 2016 16:52:02 +0000 (16:52 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744966 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 May 2016 16:51:22 +0000 (16:51 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744965 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 21 May 2016 15:18:19 +0000 (15:18 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744954 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 21 May 2016 15:16:50 +0000 (15:16 +0000)]
update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744953 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 21 May 2016 15:13:48 +0000 (15:13 +0000)]
Merge r1722177, r1722195, r1722229, r1722320, r1722328, r1722334, r1722350, r1722351, r1722358, r1722377, r1723953, r1724879, r1724992, r1724993, r1724995, r1725018, r1725031, r1725120, r1725328, r1725387, r1725489, r1725498, r1725499, r1725523, r1725545, r1725567, r1725581, r1725602, r1725822, r1725967, r1726038, r1726049, r1726051, r1726052, r1726055, r1725090, r1728326, r1737020 from trunk:
Commit framework impl of health-check module plus
required changes. The actual health checking is
currently in progress, but wanted to add in at
this stage.
Make aware of new status: Failed Health Check.
Store the number of current passes/fails in shm
finish looping logic... place-holder for actual checking
Better check
move to per server conf, useful for adding HealthCheckCondition
Now implement the condition ruleset definition. The
actual checking will be done in the actual health check
routine.
just check watched servers... use 'hc' prefix for sub directives
Check that we have names for both templates and
conditions
command changes
Don't bother w/ methods that return bodies. We don't
handle them now anyway.
Use enums and structs to keep things better organized
1st cut of 'simple' tcp check... We reuse various proxy
function and so this *could* be more streamlined, but
use this to show how the other would work, since we need
brigades, SSL/TLS support, etc.
Since every check needs this, do this in the main
check loop. Allows some optimizations.
move scope
pull this out... large enough for a func
Move to a set of health check workers, mapping to
each worker itself, instead of a single reused generic
worker.
some ordering optimization
Make balancer manager health-check aware
And we now allow for health checks via OPTIONS *
Leverage the OPTIONS code for HEAD as well...
So we now support: TCP, OPTIONS and HEAD.
Right now, anything other than an error (even a 404)
is consider a PASS.
Fill in APLOGNO.
I hope that doesn't result in merge trouble
for Jim.
Open up hook/scar to allow for passes/fails and
method to be changed via bal-man...
OPTIONS/HEAD proxy function should be diff from simple TCP check
For OPTIONS and HEAD, only 2xx and 3xx are considered "passing"
(until I implement the conditions expr testing)... honor
the pass/fail count and LOG_INFO when the health check enables
or disables a backend worker.
Start impl of expr conditions for runtime checks
Adjust log levels
correct error string
Use worker status character defines taken
from mod_proxy.h instead of explicit characters.
Noted by rpluem.
With the updated ap_expr, we can now check for the
returned response body, stored in kept_body
Assign log message tags
Implement expr lookup in mod_proxy_hcheck for
variables whose names start with "HC_" and for
the new function hc().
Currently only HC_BODY and hc(body) are supported.
Both return the saved body of the health check
response to be used in an expr that decides about
success of a check.
Fix copy&paste error in new function.
Try fixing new proxy_hcheck expr extension.
Interestingly mod_ssl using NULL as well,
but some other module I wrote uses parms->name.
Adjust
clash :)
Enabling a worker via health-check also moves them out of
ERROR more (which may have been set via the static
"health" check done via mod_proxy).
Some flow improvements...
Submitted by: jim, rjung, jim, jim, jim, jim, jim, jim, rjung, jim, jim, rjung, rjung, rjung, jim, jim, olegk, jim, jim
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744951 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 May 2016 14:28:07 +0000 (14:28 +0000)]
bump CVE to the top
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744591 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 May 2016 14:03:42 +0000 (14:03 +0000)]
Merge r1744580 from trunk:
add availability to rewriteoption too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744581 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 May 2016 14:01:34 +0000 (14:01 +0000)]
Merge r1744578 from trunk:
using context info for rewritebase was not until 2.4.16
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744579 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 18 May 2016 21:22:01 +0000 (21:22 +0000)]
Fix example in French doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744452 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 18 May 2016 15:10:20 +0000 (15:10 +0000)]
mod_http2: backport of v1.5.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744420 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 17 May 2016 17:59:19 +0000 (17:59 +0000)]
avoid copy/paste trap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744298 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 10:23:52 +0000 (10:23 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744246 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 10:23:27 +0000 (10:23 +0000)]
merge of r1743699 fromn trunk:
http_core: Avoid truncating the_request line when there is no request to 'W'rite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744245 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 10:20:58 +0000 (10:20 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744244 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 10:14:52 +0000 (10:14 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744243 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 09:36:12 +0000 (09:36 +0000)]
hcheck vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744226 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 08:29:51 +0000 (08:29 +0000)]
mod_rewrite: proposing backport of h2:// and h2c:// support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744210 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2016 08:27:47 +0000 (08:27 +0000)]
mod_proxy_http2: removed proposals that have been backported already
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744209 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 17 May 2016 06:23:06 +0000 (06:23 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744187 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 17 May 2016 06:22:51 +0000 (06:22 +0000)]
Backported mod_authn_dbm documentation update. Corrected broken link and add an example about Berkeley db. PR: 59558
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744186 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 16 May 2016 14:47:04 +0000 (14:47 +0000)]
propose PR59111 for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1744057 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 15 May 2016 07:10:32 +0000 (07:10 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743886 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 15 May 2016 07:09:51 +0000 (07:09 +0000)]
Fix typo in doc as spotted by Pete Edwards in online doc.
Improve layout.
(mostly r1743790 + r1743798 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743885 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 14 May 2016 19:01:13 +0000 (19:01 +0000)]
+1 that healthchecking goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743851 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 14 May 2016 12:00:52 +0000 (12:00 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743818 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 14 May 2016 11:58:01 +0000 (11:58 +0000)]
removing no longer needed obj from mod_proxy_http2 config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743817 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 14 May 2016 11:49:01 +0000 (11:49 +0000)]
Merge of
1742260 ,
1742359 ,
1742444 ,
1742445 ,
1742446 ,
1742447 ,
1742460 ,
1743335 ,
1743517 ,
1743788 from trunk:
mod_http2/mod_proxy_http2 update with latest changes from trunk to 1.5.4.
Update of CMake and Netware makefiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743815 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 13 May 2016 20:45:02 +0000 (20:45 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743753 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 13 May 2016 17:53:32 +0000 (17:53 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743710 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 13 May 2016 16:57:36 +0000 (16:57 +0000)]
Revert premature mis-commit of proposed patch (had only meant to test merging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743704 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 13 May 2016 16:57:17 +0000 (16:57 +0000)]
Revert premature mis-commit of proposed patch (had only meant to test merging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743703 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 13 May 2016 16:55:17 +0000 (16:55 +0000)]
Replace one backport proposal with another
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743702 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 13 May 2016 06:27:06 +0000 (06:27 +0000)]
Remove comment which was part of r1735668 (merged in r1743576) but was lost during backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743605 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 12 May 2016 21:31:44 +0000 (21:31 +0000)]
Merge r1729208, r1735668, r1735668, r1735931, r1735935, r1735942 from trunk:
let proxy handler forward ALPN protocol strings for ssl proxy connections
Remove leftover comment
Remove leftover comment
APLOGNO update for mod_proxy_http2
fix APLOGNO at wrong place, me stupid
h2_proxy_session: fill in missing APLOGNO()s.
Submitted by: icing, jailletc36, jailletc36, icing, icing, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743577 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 12 May 2016 21:29:29 +0000 (21:29 +0000)]
Merge r1729208, r1735668, r1735931, r1735935, r1735942 from trunk:
let proxy handler forward ALPN protocol strings for ssl proxy connections
Remove leftover comment
APLOGNO update for mod_proxy_http2
fix APLOGNO at wrong place, me stupid
h2_proxy_session: fill in missing APLOGNO()s.
Submitted by: icing, jailletc36, icing, icing, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743576 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 12 May 2016 21:27:47 +0000 (21:27 +0000)]
Merge r1742135 from trunk:
We need another guard, this may resolve a crash in the rather odd faux-server
implementation in mod_perl test suite which calls access checking too early.
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743575 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 12 May 2016 21:27:15 +0000 (21:27 +0000)]
prmote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743574 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 12 May 2016 21:26:40 +0000 (21:26 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743573 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 12 May 2016 15:11:21 +0000 (15:11 +0000)]
Don't globber scoreboard request info if read_request_line() fails with
a timeout. In that case there's not yet any new useful request info
available.
Noticed via server-status for prefork showing request "NULL" after
keep-alive connections timed out.
PR: 59333.
Backports:
1742792
Submitted by: rjung
Reviewed by: ylavic, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743516 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 12 May 2016 14:44:02 +0000 (14:44 +0000)]
Promote the half which has concensus, split aside the third disputed patchw
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743510 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 11 May 2016 11:17:43 +0000 (11:17 +0000)]
fixed mod_http2 CVE added to CHANGES in 2.4.20, late to the party but it is there.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743337 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 10 May 2016 21:52:55 +0000 (21:52 +0000)]
Update to match english revision
added missing new lines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743265 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 May 2016 15:46:14 +0000 (15:46 +0000)]
Reviewed, half correct
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743218 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 10 May 2016 13:24:26 +0000 (13:24 +0000)]
Update to match english revision
added missing lines
builded the html file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743174 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 9 May 2016 22:43:33 +0000 (22:43 +0000)]
updated the es lang reference
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743077 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 9 May 2016 16:56:22 +0000 (16:56 +0000)]
fixed misspelled word
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1743004 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 8 May 2016 20:06:15 +0000 (20:06 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742850 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 8 May 2016 14:36:29 +0000 (14:36 +0000)]
Enhance proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742828 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 May 2016 13:22:33 +0000 (13:22 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742815 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 May 2016 13:21:05 +0000 (13:21 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742814 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 8 May 2016 10:30:38 +0000 (10:30 +0000)]
Propose another (small) scoreboard/mod_status fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742794 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 May 2016 16:32:17 +0000 (16:32 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742730 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 May 2016 16:30:39 +0000 (16:30 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742729 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 5 May 2016 19:51:53 +0000 (19:51 +0000)]
iNo need to set CFLAGS and LDFLAGS for "ab"
during detection of libnghttp2. "ab" doesn't
yet support http2.
The macros were probably copied over from our
OpenSSL detection, where it actually makes
sense to adjust the "ab" flags.
Backport of r1742460 from trunk.
CTR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742463 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 5 May 2016 15:45:51 +0000 (15:45 +0000)]
Fix two CHANGES typos and remove whitespace
from empty lines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742441 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 May 2016 13:58:02 +0000 (13:58 +0000)]
mod_http2: backport of v1.5.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742288 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 May 2016 18:57:04 +0000 (18:57 +0000)]
Merge r1741310, r1741461 from trunk:
Ensure http2 follows http in the meaning of
status WRITE (meaning 'in the request processing
phase' even if still consuming the request body,
not literally in a 'now writing' state).
Ensure a number of MPMs and the h2 connection io
no longer clobber the request status line during
state-only changes. While at it, clean up some
very ugly formatting and unnecessary decoration,
and avoid the wordy _from_conn() flavor when we
are not passing a connection_rec.
Ensure the useragent_ip is only used in the case
where it has been initialized, fall back on the
connection's remote_ip if the status is accidently
updated from an uninitialized request_rec.
Revert to 2.4.1 behavior and null the request and vhost as appropriate.
PR: 59333
Submitted by: wrowe
Reviewed by: wrowe, ylavic, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742179 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 May 2016 18:49:08 +0000 (18:49 +0000)]
move Define/Undefine context issue as stalled as a reminder to
figure something out for 2.4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742176 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 May 2016 18:00:44 +0000 (18:00 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742165 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 May 2016 17:59:41 +0000 (17:59 +0000)]
* Reverse mergeinfo change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742164 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 3 May 2016 17:57:52 +0000 (17:57 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742163 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 May 2016 16:32:42 +0000 (16:32 +0000)]
Elevate to patch for consideration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742142 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 May 2016 16:30:27 +0000 (16:30 +0000)]
Document an objection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742140 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 3 May 2016 16:13:01 +0000 (16:13 +0000)]
Propose a hack for the borken modperl example server segv
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742137 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 2 May 2016 19:31:57 +0000 (19:31 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742032 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 2 May 2016 19:31:21 +0000 (19:31 +0000)]
Fixed wording about the event's doc page after Mike's feedback on dev@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1742031 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 May 2016 13:46:35 +0000 (13:46 +0000)]
Remove useless <br \> in highlight blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741864 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 May 2016 09:13:01 +0000 (09:13 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741848 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 May 2016 06:36:33 +0000 (06:36 +0000)]
Remove useless <br \> in highlight blocks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741841 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 May 2016 06:26:47 +0000 (06:26 +0000)]
Synch with trunk (remove trailing spaces)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741840 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 30 Apr 2016 20:54:33 +0000 (20:54 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741815 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 30 Apr 2016 20:52:47 +0000 (20:52 +0000)]
Backport of the "Bugfix checklist" panel from trunk. Each module's page gets
a new section on the right panel containing three links:
- httpd changelog
- Bugzilla issues related to the module
- Open a bugzilla issue related to the module
This commit also fixes a minor inconsistency for the "comments" link, that is
now always displayed under "See also"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741814 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Apr 2016 14:43:44 +0000 (14:43 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741771 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Apr 2016 14:42:58 +0000 (14:42 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741770 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 30 Apr 2016 09:41:28 +0000 (09:41 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741734 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 30 Apr 2016 09:41:02 +0000 (09:41 +0000)]
Added a reference to the mpm-event's doc about the fact that it does not require any mpm-accept mutex set.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741733 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 29 Apr 2016 11:20:52 +0000 (11:20 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1741611 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log