]>
granicus.if.org Git - apache/log
William A. Rowe Jr [Tue, 22 Mar 2016 20:00:08 +0000 (20:00 +0000)]
Ensure we pick up modules/proxy/*.h headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1736242 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 22 Mar 2016 09:04:19 +0000 (09:04 +0000)]
Merge of r1736156 from trunk:
adding missing h2_ngn_shed.c to mod_http2.dsp for win build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1736157 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 17:24:38 +0000 (17:24 +0000)]
Follow-up to r1735886:
Add back accidentally-deleted file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1736071 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 17:19:53 +0000 (17:19 +0000)]
??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1736070 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 17:19:09 +0000 (17:19 +0000)]
and we are now 2.4.20-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1736069 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 17:16:43 +0000 (17:16 +0000)]
Prep for tag/roll of 2.4.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1736067 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Mar 2016 14:07:14 +0000 (14:07 +0000)]
forgive me Yann for I have sinned
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735978 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 21 Mar 2016 13:33:38 +0000 (13:33 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735970 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Mar 2016 12:54:05 +0000 (12:54 +0000)]
CGIVar before too long I hope???
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735969 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 21 Mar 2016 12:41:15 +0000 (12:41 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735966 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 21 Mar 2016 12:38:58 +0000 (12:38 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735965 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Mar 2016 12:37:25 +0000 (12:37 +0000)]
Merge
1734817 ,
1734955 , r1734989, from trunk:
mod_include now sets DOCUMENT_ARGS.
* Like DOCUMENT_URI, this is for the SSI document, not for any
subrequest called for the include directive.
* Like QUERY_STRING, this is just r->args (or empty string if there are
none), unlike QUERY_STRING_UNESCAPED.
The name of the variable is taken from the Zeus SSI implementation.
Follow-up to r1734817: suexec passes through mod_include's DOCUMENT_ARGS
Follow-up to r1734817: Reorder, mention compatibility
Submitted by: trawick
Reviewed by: jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735963 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Mar 2016 12:28:04 +0000 (12:28 +0000)]
Follow-up to r1735886:
Add mod_ssl_openssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735961 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 21 Mar 2016 12:25:48 +0000 (12:25 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735960 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Mar 2016 12:20:36 +0000 (12:20 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735958 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Mar 2016 12:20:15 +0000 (12:20 +0000)]
punctuation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735957 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Mar 2016 12:15:52 +0000 (12:15 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735956 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 21 Mar 2016 12:15:38 +0000 (12:15 +0000)]
Add CHANGES entry for r1735947 and trim spurious white spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735955 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 21 Mar 2016 12:15:36 +0000 (12:15 +0000)]
drop 2.3-and-later from compat info
add compt info for forward-dns in two places
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735954 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 12:04:59 +0000 (12:04 +0000)]
This should be in 2.4.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735951 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 21 Mar 2016 11:57:41 +0000 (11:57 +0000)]
DOCUMENT_ARGS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735950 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 11:30:24 +0000 (11:30 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735948 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 11:29:29 +0000 (11:29 +0000)]
Merge r1734412 from trunk:
mod_authz_host: add a new "forward-dns" authorization type
This new type does not rely on reverse DNS lookups.
Submitted by: fabien
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735947 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 11:28:53 +0000 (11:28 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735946 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 21 Mar 2016 11:28:32 +0000 (11:28 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735945 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 21 Mar 2016 11:08:14 +0000 (11:08 +0000)]
mod_proxy_http2: updated patch yet again with more APLOGNO goodness, thank Yann
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735944 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 21 Mar 2016 10:06:49 +0000 (10:06 +0000)]
mod_proxy_http2: updated patch for backport with APLOGNOs filled in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735937 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 21 Mar 2016 08:56:18 +0000 (08:56 +0000)]
adding change description fro mod_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735927 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 20 Mar 2016 22:46:18 +0000 (22:46 +0000)]
Follow-up to r1735886:
Add mod_ssl_openssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735910 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 20 Mar 2016 15:51:49 +0000 (15:51 +0000)]
Merge r1587607, r1588868 from trunk:
mod_ssl: Add hooks to allow other modules to perform processing at
several stages of initialization and connection handling. See
mod_ssl_openssl.h.
This is enough to allow implementation of Certificate Transparency
outside of mod_ssl.
Initialize post_handshake_rc for case where a failure has
already occurred (doesn't change execution but avoids warning
with some levels of gcc).
Pointed out by: kbrand
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735886 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 20 Mar 2016 15:51:03 +0000 (15:51 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735885 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 20 Mar 2016 15:50:46 +0000 (15:50 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735884 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 20 Mar 2016 00:37:24 +0000 (00:37 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735833 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 19 Mar 2016 23:11:35 +0000 (23:11 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735832 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 19 Mar 2016 21:51:23 +0000 (21:51 +0000)]
mod_ssl_openssl.h stuff perhaps, for CT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735823 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 19 Mar 2016 20:18:24 +0000 (20:18 +0000)]
Commented vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735807 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 18:59:23 +0000 (18:59 +0000)]
Merge r1735786 from trunk:
fix order of lowercase/compare for r->handler
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735802 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 18:58:59 +0000 (18:58 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735800 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 18:58:39 +0000 (18:58 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735799 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 19 Mar 2016 16:51:54 +0000 (16:51 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735788 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 19 Mar 2016 16:49:49 +0000 (16:49 +0000)]
r->handler =None fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735787 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 13:28:46 +0000 (13:28 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735772 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 13:26:41 +0000 (13:26 +0000)]
Merge r1619483 from trunk:
mod_deflate: follow up to r1619444.
Fix counting of inflated bytes in deflate_in_filter() when asked to flush, since
we now count bytes per inflate() call everywhere, we can't count all the produced
bytes there.
We still need to include all the produced bytes in the brigade.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735771 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 13:26:25 +0000 (13:26 +0000)]
Merge r1720129, r1723295, r1733088, r1733089 from trunk:
* mod_ssl: Free dhparams when getting DH params. This fixes issue when
SSLCryptoDevice does not get unregistered because of non-zero refcount
during the mod_ssl unload happening on httpd startup.
mod_ssl: follow up to r1720129.
Free ecparams read from certificate file(s) on startup.
Follow up to r1720129 and r1723295: CHANGES entry.
Rephrase r1733088 since leaking means horrible things in cryptography.
This is not a security fix :p
Submitted by: jkaluza, ylavic, ylavic, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735770 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 19 Mar 2016 13:25:28 +0000 (13:25 +0000)]
Merge r1726167 from trunk:
expr support for HTTP2 variable
Submitted by: icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735769 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 19 Mar 2016 10:42:30 +0000 (10:42 +0000)]
proxy_http2 patch updated after code review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735749 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Mar 2016 17:35:48 +0000 (17:35 +0000)]
Follow up to r1734396: CHANGES entry.
Since ssl_run_pre_handshake() is not (yet) in 2.4.x, mention ssl_init_ssl_connection() instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735650 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Mar 2016 16:50:30 +0000 (16:50 +0000)]
Summary: vote/promote mod_deflate input filter fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735639 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Mar 2016 16:14:39 +0000 (16:14 +0000)]
Summary: vote/promote possible memory leak on restart for custom [EC]DH params
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735634 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 18 Mar 2016 15:57:32 +0000 (15:57 +0000)]
Summary: vote/promote HTTP2=on|off
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735625 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 18 Mar 2016 15:41:12 +0000 (15:41 +0000)]
Merge of r1735611 from trunk:
mod_http2: refrain from unnecessary flushes on master connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735620 13f79535 -47bb-0310-9956-
ffa450edef68
Fabien Coelho [Fri, 18 Mar 2016 15:30:02 +0000 (15:30 +0000)]
add vote for r1734412
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735616 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 18 Mar 2016 14:48:36 +0000 (14:48 +0000)]
Merge of
1735608 ,
1735609 from trunk:
mod_http2: stream cleanup on GOAWAY handling, PUSHes prohibited after client GOAWAY.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735610 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 17:37:35 +0000 (17:37 +0000)]
proposal to backport mod_proxy_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735466 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 17:09:16 +0000 (17:09 +0000)]
patch by NormW to make proxy and mod_http2 build on Netware in current form
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735459 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 16:54:05 +0000 (16:54 +0000)]
mod_http2: backport of 1.4.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735457 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 09:42:18 +0000 (09:42 +0000)]
Merge r1629925, r1629927, r1629928, r1733162, r1733173 from trunk:
Ensure that httpd exits with an error status when the MPM fails
to run. [Yann Ylavic]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735381 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 09:39:53 +0000 (09:39 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735380 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 09:28:51 +0000 (09:28 +0000)]
Merge r1735088 from trunk:
[PATCH] mod_rewrite: double escaping of query strings in server context
(like PR50447, for server context)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735379 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 17 Mar 2016 09:24:13 +0000 (09:24 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735377 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 16 Mar 2016 23:16:18 +0000 (23:16 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735340 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 16 Mar 2016 23:07:33 +0000 (23:07 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735339 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 16 Mar 2016 15:16:00 +0000 (15:16 +0000)]
backport of mod_http2 v1.4.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735239 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 15 Mar 2016 17:23:15 +0000 (17:23 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735147 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 15 Mar 2016 17:21:55 +0000 (17:21 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735146 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Mar 2016 15:01:12 +0000 (15:01 +0000)]
propose rewrite query string patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735091 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 15 Mar 2016 08:34:57 +0000 (08:34 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735037 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 15 Mar 2016 06:44:48 +0000 (06:44 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1735023 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 14 Mar 2016 11:08:26 +0000 (11:08 +0000)]
mod_http2: backport of fix for streams without :authority header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734917 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 12 Mar 2016 16:52:57 +0000 (16:52 +0000)]
Fix a small doxygen issue (r1734716 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734717 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 10 Mar 2016 14:01:10 +0000 (14:01 +0000)]
Merge r1734239 from trunk:
mod_reqtimeout: Prevent long response times from triggering a timeout once
the request has been fully read. PR 59045.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734416 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 10 Mar 2016 13:57:54 +0000 (13:57 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734415 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 10 Mar 2016 13:50:46 +0000 (13:50 +0000)]
proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734414 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 10 Mar 2016 13:37:55 +0000 (13:37 +0000)]
backported mod_http2 1.4.0 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734413 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 10 Mar 2016 12:34:43 +0000 (12:34 +0000)]
Merge r1734294 from trunk:
followup to r1734125: null check for r->args
before cleaning up some QSA cases.
Submitted by: covener
Reviewed by: covener, rpluem, ylavic
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734397 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 10 Mar 2016 12:31:13 +0000 (12:31 +0000)]
Merge r1734006 from trunk:
mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake()
hook returns an error.
Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734396 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 10 Mar 2016 12:27:49 +0000 (12:27 +0000)]
Merge r1733523, r1733691 from trunk:
Use ap_array_str_contains to simplify code
Use ap_array_str_contains to simplify code
Remove a useless test (groups is always NULL)
Improve some style
Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734395 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 10 Mar 2016 12:22:23 +0000 (12:22 +0000)]
Backported in r1734391.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734393 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 10 Mar 2016 12:15:59 +0000 (12:15 +0000)]
Merge r1601624 from trunk:
Strip useless apr_brigade_cleanup() calls.
Submitted/backported by: ylavic
Reviewed by: jailletc36, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734391 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 10 Mar 2016 12:03:22 +0000 (12:03 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734390 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Mar 2016 06:45:08 +0000 (06:45 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734358 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Mar 2016 06:44:48 +0000 (06:44 +0000)]
Revert part of last change because the corresponding display looks strange.
Only keep changes related to sycnh with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734357 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Mar 2016 05:34:56 +0000 (05:34 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734354 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Mar 2016 05:33:58 +0000 (05:33 +0000)]
Be more consistent in the way examples are formatted
Spotted by David Eisner in online doc
+ synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734353 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 9 Mar 2016 22:40:45 +0000 (22:40 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734331 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 9 Mar 2016 22:36:16 +0000 (22:36 +0000)]
property fixup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734328 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 9 Mar 2016 20:24:03 +0000 (20:24 +0000)]
* Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734306 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 9 Mar 2016 18:24:54 +0000 (18:24 +0000)]
backport rewrite ? handling bug fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734295 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 9 Mar 2016 15:13:04 +0000 (15:13 +0000)]
Merge r1734125 from trunk:
mod_rewrite: Add QSL|qslast flag to allow rewrites to files with
literal question marks in their names.
PR 58777.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734259 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 9 Mar 2016 15:10:55 +0000 (15:10 +0000)]
mod_rewrite: PR58854: Revert r1726016 (rewrite looping issue) which was
reverted in trunk in r1732896. The fix is bad and breaks old loop
avoidance.
Reviewed By: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734257 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Mar 2016 13:52:38 +0000 (13:52 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734240 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Mar 2016 12:19:13 +0000 (12:19 +0000)]
Comment, ask...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734226 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Mar 2016 12:03:08 +0000 (12:03 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734223 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 9 Mar 2016 11:48:51 +0000 (11:48 +0000)]
votes!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734220 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 8 Mar 2016 19:25:30 +0000 (19:25 +0000)]
add PR58777
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734127 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 8 Mar 2016 19:19:20 +0000 (19:19 +0000)]
move to proper section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734126 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 8 Mar 2016 13:18:58 +0000 (13:18 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734077 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 8 Mar 2016 13:18:41 +0000 (13:18 +0000)]
Backporting documentation commits from trunk (new mod_ssl note about ECC): r1734058,r1734060,r1734067,r1734069
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734076 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 7 Mar 2016 23:46:35 +0000 (23:46 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1734008 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Mar 2016 18:24:21 +0000 (18:24 +0000)]
Merge r1733952, r1733953 from trunk:
Note that Timeout on a new connection can be "hidden" by an
AcceptFilter.
Timeout scenarios are more of an unordered list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1733954 13f79535 -47bb-0310-9956-
ffa450edef68