]>
granicus.if.org Git - apache/log
Jim Jagielski [Tue, 29 Dec 2015 16:27:11 +0000 (16:27 +0000)]
Merge r1715255 from trunk:
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722181 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 16:26:41 +0000 (16:26 +0000)]
Merge r1715567, r1715568, r1715570, r1715571, r1715572, r1715576, r1715581, r1715582, r1715583, r1715584, r1715585 from trunk:
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Add a blank line between functions.
Remove some useless 'return' statements.
Fix style and alignment.
Remove some useless 'return' statements.
Fix style.
Remove some useless 'return' statements.
Add a blank line between functions.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Remove some useless 'return' statements.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722180 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 16:25:04 +0000 (16:25 +0000)]
Merge r1719967 from trunk:
mod_ssl: fix build with openssl < 0.9.8m (missing semicolon).
Reported by: Petr Gajdos <pgajdos suse.cz>
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722179 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Dec 2015 15:45:27 +0000 (15:45 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722161 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Dec 2015 15:41:44 +0000 (15:41 +0000)]
propose GlobalLog since it was requested in a user PR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722158 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Dec 2015 14:20:15 +0000 (14:20 +0000)]
backport req.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1722139 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 28 Dec 2015 18:52:02 +0000 (18:52 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721981 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 28 Dec 2015 18:45:44 +0000 (18:45 +0000)]
Merge r1721978 from trunk:
add a mod_headers condition clause expression example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721979 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 28 Dec 2015 18:27:27 +0000 (18:27 +0000)]
Merge r1721975 from trunk:
PR58764: python example for sha1 password hashes
Submitted By: Dave Hall <skwashd gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721976 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 28 Dec 2015 18:24:39 +0000 (18:24 +0000)]
Merge r1721973 from trunk:
PR58761: developer doc improvements.
Submitted By: Luca Toscano
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721974 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 28 Dec 2015 18:00:40 +0000 (18:00 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721964 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 28 Dec 2015 17:58:56 +0000 (17:58 +0000)]
Formatting of example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721962 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Dec 2015 12:51:53 +0000 (12:51 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721911 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 28 Dec 2015 12:28:54 +0000 (12:28 +0000)]
CHANGES: move entry to the right/effective version.
r1715014 somehow put it in 2.4.17, whereas it was really backported in 2.4.18.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1721907 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 16 Dec 2015 06:40:35 +0000 (06:40 +0000)]
Yup, doh - and rebutt a non-starter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1720297 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 15 Dec 2015 16:05:59 +0000 (16:05 +0000)]
Vote and comment on trivial mod_ssl fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1720186 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 15 Dec 2015 13:05:05 +0000 (13:05 +0000)]
Propose r1720129
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1720150 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 14 Dec 2015 17:28:56 +0000 (17:28 +0000)]
Propose trivial (build) fix for mod_ssl with openssl < 0.9.8m.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1719968 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Dec 2015 14:38:24 +0000 (14:38 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1719693 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Dec 2015 14:37:26 +0000 (14:37 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1719692 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Dec 2015 20:30:55 +0000 (20:30 +0000)]
And we are 2.4.19-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718694 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Dec 2015 20:29:31 +0000 (20:29 +0000)]
Get ready to tag 2.4.18
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718692 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 8 Dec 2015 16:47:01 +0000 (16:47 +0000)]
Add an alert for module developers that this subset (specifically,
only the recently added 2.4.17 Protocol API's) may still be in flux,
until the group has concensus on the API behavior.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718645 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 8 Dec 2015 13:36:57 +0000 (13:36 +0000)]
merge from trunk:removing HTTP_HEADER output filter on upgraded connections, so timeouts do not send http/1.1 responses any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718600 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 8 Dec 2015 13:30:30 +0000 (13:30 +0000)]
Comment about ap_request_has_body() check for Upgrade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718595 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 8 Dec 2015 13:22:38 +0000 (13:22 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718589 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 8 Dec 2015 13:08:13 +0000 (13:08 +0000)]
Merge r1718569 from trunk.
h2_from_h1: To avoid any further confusion, r->err_headers should be cleared
once merged into r->headers_out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718586 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 8 Dec 2015 11:03:31 +0000 (11:03 +0000)]
mod_http2: merged from trunk, sending out push promises *before* the stream response to make client handling of preload links easier
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718559 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 7 Dec 2015 18:08:30 +0000 (18:08 +0000)]
Better explain what this patch does and doesn't do
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718433 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 16:42:24 +0000 (16:42 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718423 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Mon, 7 Dec 2015 16:37:24 +0000 (16:37 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718422 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 7 Dec 2015 15:34:24 +0000 (15:34 +0000)]
merged H2PushPriority befiore 'weight' loss from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718406 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 7 Dec 2015 12:56:52 +0000 (12:56 +0000)]
mod_http v1.0.11, fixes duplicate response headers when post_req_hook gets invoked twice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718341 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 12:30:11 +0000 (12:30 +0000)]
Merge r1715273 from trunk:
Save a few bytes in conf pool.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718333 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 12:29:46 +0000 (12:29 +0000)]
Merge r1716940, r1717086 from trunk:
Use 'ap_pbase64decode' to simplify code.
Silent a sparse Warning.
cid->ecb->lpszLogData can not be NULL.
It is defined in mod_isapi.h as:
typedef struct EXTENSION_CONTROL_BLOCK {
...
char lpszLogData[80];
...
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718332 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 12:28:51 +0000 (12:28 +0000)]
Merge r1717958 from trunk:
using c->master for ssl var lookups when c holds no valid SSLConnRec. Fixes PR58666.
Submitted by: icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718331 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 12:18:18 +0000 (12:18 +0000)]
promotes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718326 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 12:18:00 +0000 (12:18 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718325 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 7 Dec 2015 12:17:35 +0000 (12:17 +0000)]
Merge r1717063 from trunk:
Fix the use of the default 'flush' provider.
Improve documentation for the "flusher" parameter.
Remove useless empty lines.
See http://mail-archives.apache.org/mod_mbox/httpd-dev/200812.mbox/%
3C494226C0 .
4050407 @force-elite.com%3E for some more explanation.
A python script is given there to test.
I had to tweak it to have it work
(use:
fd, payload = passfd.recvfd(conn.fileno())
instead of:
fd = passfd.recvfd(conn.fileno())
)
This is a r1058621 regression, where somehow "char *flusher" has been turned into a "char flusher[]". So it is been broken since the beginning of 2.4.x
After this change (i.e. r1058621), 'flusher' is no more a pointer (NULL'ed when the structure it belongs to is created) but the address of an array within a structure. It can not be NULL anymore.
So, we now have to look at the content of the array itself to see if it has been initialized or if we have to use the default value instead.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718324 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 7 Dec 2015 11:51:17 +0000 (11:51 +0000)]
mod_http2: version bump, merge of authority default port handling for upgraded requests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718318 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 7 Dec 2015 11:46:48 +0000 (11:46 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718315 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 6 Dec 2015 19:46:04 +0000 (19:46 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718210 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 6 Dec 2015 07:54:54 +0000 (07:54 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718147 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 5 Dec 2015 22:46:15 +0000 (22:46 +0000)]
Straightforward, good catch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718130 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Dec 2015 16:04:21 +0000 (16:04 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718102 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Dec 2015 16:02:14 +0000 (16:02 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718101 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 4 Dec 2015 20:19:55 +0000 (20:19 +0000)]
Put proposal in the right section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1718021 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 4 Dec 2015 15:43:14 +0000 (15:43 +0000)]
merging floor() removal from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717986 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 4 Dec 2015 15:16:24 +0000 (15:16 +0000)]
v1.0.10 of mod_http2 backport, see CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717980 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 4 Dec 2015 13:10:49 +0000 (13:10 +0000)]
proposing backport of ssl var lookups in c->master
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717959 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 3 Dec 2015 18:16:11 +0000 (18:16 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717824 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 3 Dec 2015 18:12:08 +0000 (18:12 +0000)]
Satisfy XML validation and fix some typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717823 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 3 Dec 2015 16:42:14 +0000 (16:42 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717802 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 3 Dec 2015 16:38:29 +0000 (16:38 +0000)]
Typos and grammar corrections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717800 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 3 Dec 2015 16:31:00 +0000 (16:31 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717798 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 2 Dec 2015 14:42:42 +0000 (14:42 +0000)]
merge of
1717639 , fixing WINDOW_UPDATEs on small stream inputs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717641 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Nov 2015 21:04:46 +0000 (21:04 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717126 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Nov 2015 21:03:57 +0000 (21:03 +0000)]
Fix doc as spotted by mat in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717125 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Nov 2015 13:52:26 +0000 (13:52 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1717065 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Nov 2015 15:42:28 +0000 (15:42 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716993 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Nov 2015 15:41:22 +0000 (15:41 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716992 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 26 Nov 2015 21:28:55 +0000 (21:28 +0000)]
Fix typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716770 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 26 Nov 2015 14:06:33 +0000 (14:06 +0000)]
merge of trunk fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716662 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Nov 2015 13:44:39 +0000 (13:44 +0000)]
Merge r1711728, r1713209 from trunk:
For the "SSLStaplingReturnResponderErrors off" case, make sure to only
staple responses with certificate status "good". Also avoids including
inaccurate responses when the OCSP responder is not completely up
to date in terms of the CA-issued certificates (and provides interim
"unknown" or "extended revoked" [RFC 6960] status replies).
Log a certificate status other than "good" in stapling_check_response().
Propagate the "ok" status from stapling_check_response() back via both
stapling_renew_response() and get_and_check_cached_response() to the
callback code in stapling_cb(), enabling the decision whether to include
or skip the response.
insert missing LOGNO in ssl_util_stapling.c
Submitted by: kbrand
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716652 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Nov 2015 13:42:42 +0000 (13:42 +0000)]
Merge r1710095, r1710105, r1711902 from trunk:
core: Limit to ten the number of tolerated empty lines between request,
and consume them before the pipelining check to avoid possible response
delay when reading the next request without flushing.
Before this commit, the maximum number of empty lines was the same as
configured LimitRequestFields, defaulting to 100, which was way too much.
We now use a fixed/hard limit of 10 (DEFAULT_LIMIT_BLANK_LINES).
check_pipeline() is changed to check for (up to the limit) and comsume the
trailing [CR]LFs so that they won't be interpreted as pipelined requests,
otherwise we would block on the next read without flushing data, and hence
possibly delay pending response(s) until the next/real request comes in or
the keepalive timeout expires.
Finally, when the maximum number of empty line is reached in
read_request_line(), or that request line does not contains at least a method
and an (valid) URI, we can fail early and avoid some failure detected in
further processing.
core: follow up to r1710095.
Simplify logic in check_pipeline(), and log unexpected errors.
core: follow up to r1710095, r1710105.
We can do this in a single (no inner) loop, and simplify again the logic.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716651 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Nov 2015 13:41:34 +0000 (13:41 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Nov 2015 13:41:07 +0000 (13:41 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716649 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 26 Nov 2015 07:38:39 +0000 (07:38 +0000)]
Easy proposal to synch 2.4.x and trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716572 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 Nov 2015 17:12:38 +0000 (17:12 +0000)]
merged mod_http2 1.0.8 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716493 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 24 Nov 2015 16:58:31 +0000 (16:58 +0000)]
mod_http2, version 1.0.7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1716210 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 22 Nov 2015 04:18:00 +0000 (04:18 +0000)]
Merge r1712382,
1713937 from trunk for cmake build
follow-up r1715371
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715600 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 20 Nov 2015 15:13:11 +0000 (15:13 +0000)]
update of mod_http2 with current trunk version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715371 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2015 19:55:25 +0000 (19:55 +0000)]
Merge r1708107, r1709587, r1709602, r1709995, r1710231, r1710419, r1710572, r1710583, r1715023 from trunk:
mod_ssl: performing protocol switch directly after ALPN selection, mod_http2: connection hook inits network filters to force TLS handshake, reads input only if H2Direct explicitly enabled, changes H2Direct default to off even for cleartext connections
new ap_is_allowed_protocol() for testing configured protocols, added H2Upgrade on/off directive, changed H2Direct default back to on when h2c is in Protocols
moved ssl handshake trigger from mod_http2 to new process_connection hook in mod_ssl
mod_ssl: check request-server for TLS settings compatible to handshake server, allow request if equal, renegotiation checks: remember last used cipher_suite for optimizations, deny any regnegotiation in presence of master connection
announce protocol choices on first request
fixing compilation issue for older platform
disabling protocol upgrades on slave connections
first request on master connection only reports more preferred protocols in Upgrade header
mod_ssl: follow up to r1709602.
Fix "HTTP spoken on HTTPS port" broken by the SSL handshake trigger moved to
process_connection hook (r1709602) along with H2Direct speculative read.
Submitted by: icing, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715255 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2015 19:51:46 +0000 (19:51 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715252 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2015 19:51:25 +0000 (19:51 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715251 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Nov 2015 16:10:37 +0000 (16:10 +0000)]
updated after incorporating change by ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715205 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Nov 2015 16:06:32 +0000 (16:06 +0000)]
merged r1715023 as proposed by ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1715202 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Nov 2015 14:58:52 +0000 (14:58 +0000)]
update merge of changes in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1715192 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Nov 2015 14:35:16 +0000 (14:35 +0000)]
Conditional promotion :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715186 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Nov 2015 08:45:52 +0000 (08:45 +0000)]
Comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715127 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:15:29 +0000 (16:15 +0000)]
Merge r1711553, r1713040, r1683881 from trunk:
Constify + save a few bytes in conf pool
Save a few bytes in conf pool when processing 'AllowOverrideList'.
The 'override_list' table is allocated from the cmd->pool, just as all strings from argv[].
So there is no need to duplicate them.
+ some minor style issues
Save a few bytes in conf pool
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715015 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:14:36 +0000 (16:14 +0000)]
Merge r1705194, r1705823, r1705826, r1705828, r1705833, r1706275, r1707230, r1707231 from trunk:
mod_ssl: forward EOR (only) brigades to the core_output_filter().
mod_ssl: don't FLUSH output (blocking) on read.
This defeats deferred write (and pipelining), eg. check_pipeline() is not
expecting the pipe to be flushed under it.
So let OpenSSL >= 0.9.8m issue the flush when necessary (earlier versions
are known to not handle all the cases, so we keep flushing with those).
mod_ssl: follow up to r1705823.
Oups, every #if needs a #endif...
mod_ssl: pass through metadata buckets untouched in ssl_io_filter_output(),
the core output filter needs them.
Proposed by: jorton
mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.
Add CHANGES entry, and restore ap_process_request_after_handler()'s comment
as prior to r1705194 (the change makes no sense now).
mod_ssl: follow up to r1705823.
We still need to flush in the middle of a SSL/TLS handshake.
mod_ssl: follow up to r1705823.
Flush SSL/TLS handshake data when writing (instead of before reading),
and only when necessary (openssl < 0.9.8m or proxy/client side).
mod_ssl: follow up to r1707230: fix (inverted) logic for SSL_in_connect_init().
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715014 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:12:46 +0000 (16:12 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715013 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:11:47 +0000 (16:11 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715012 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 18 Nov 2015 08:49:22 +0000 (08:49 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714949 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 18 Nov 2015 06:42:41 +0000 (06:42 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714942 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Nov 2015 09:55:37 +0000 (09:55 +0000)]
update STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714745 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Nov 2015 09:48:54 +0000 (09:48 +0000)]
update STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714742 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Nov 2015 09:27:58 +0000 (09:27 +0000)]
STATUS update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714738 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 8 Nov 2015 08:14:21 +0000 (08:14 +0000)]
propose SSLStaplingReturnResponderErrors improvement fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1713210 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2015 14:55:55 +0000 (14:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1713142 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2015 14:55:07 +0000 (14:55 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1713141 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Nov 2015 15:30:18 +0000 (15:30 +0000)]
proposing set of core/mod_ssl changes for http/2 improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712568 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Nov 2015 15:15:16 +0000 (15:15 +0000)]
merge of
1708107 ,
1709587 ,
1709602 ,
1709995 ,
1710231 ,
1710419 ,
1710572 ,
1710583 from trunk, addition of master conn_rec*, minor bump of mmn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1712567 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Nov 2015 12:38:16 +0000 (12:38 +0000)]
temp branch collecting changes for backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1712542 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 4 Nov 2015 09:57:51 +0000 (09:57 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712521 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 4 Nov 2015 06:19:16 +0000 (06:19 +0000)]
Add a note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712475 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:31:28 +0000 (13:31 +0000)]
core: Fix scoreboard crash (SIGBUS) on hardware requiring strict 64bit
alignment (SPARC64, PPC64).
Submitted by: ylavic
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712294 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:27:54 +0000 (13:27 +0000)]
mod_cache: Accept HT (Horizontal Tab) when parsing cache related header
fields as described in RFC7230. See OWS definition.
Submitted by: jailletc36
Reviewed by: ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712293 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:25:39 +0000 (13:25 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712292 13f79535 -47bb-0310-9956-
ffa450edef68