]>
granicus.if.org Git - apache/log
Yann Ylavic [Thu, 11 Jun 2015 13:13:37 +0000 (13:13 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684879 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Jun 2015 12:55:27 +0000 (12:55 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684872 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Jun 2015 12:54:20 +0000 (12:54 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684871 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Jun 2015 12:30:35 +0000 (12:30 +0000)]
note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684865 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 9 Jun 2015 21:12:57 +0000 (21:12 +0000)]
Fix CVE-2015-3185 reference in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684533 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 20:42:44 +0000 (20:42 +0000)]
SECURITY: CVE-2015-3185 (cve.mitre.org)
Replacement of ap_some_auth_required (unusable in Apache httpd 2.4)
with new ap_some_authn_required and ap_force_authn hook.
Submitted by: breser
Backports: r1684524
Reviewed by: wrowe, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684525 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 20:16:39 +0000 (20:16 +0000)]
CVE-2015-3183 Fix chunk header parsing defect.
Remove apr_brigade_flatten(), buffering and duplicated code from
the HTTP_IN filter, parse chunks in a single pass with zero copy.
Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
authorized characters.
Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, jim
Backports:
1484852 ,
1684513
Reported by: regilero <regis.leroy makina-corpus.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684515 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 9 Jun 2015 18:03:20 +0000 (18:03 +0000)]
Merge r1619453 from trunk
* mod_deflate: Add missing APLOGNO.
Submitted by: ylavic
Reviewed by: jailletc36, gsmith, druggeri
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684490 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 9 Jun 2015 05:13:03 +0000 (05:13 +0000)]
Add compatibility note.
Turn some tabs into space.
Remove some useless <br /> in <highlight> blocks. (this was causing some additionnal blank lines at the end of some examples)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684314 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 9 Jun 2015 04:33:52 +0000 (04:33 +0000)]
Add compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684312 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 8 Jun 2015 20:14:17 +0000 (20:14 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684267 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 8 Jun 2015 19:30:50 +0000 (19:30 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1684251 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 6 Jun 2015 17:35:35 +0000 (17:35 +0000)]
Easy vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683937 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Jun 2015 15:55:46 +0000 (15:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683926 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Jun 2015 15:54:46 +0000 (15:54 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683925 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 6 Jun 2015 05:44:16 +0000 (05:44 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683882 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 5 Jun 2015 16:00:02 +0000 (16:00 +0000)]
easy vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683787 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 5 Jun 2015 05:47:37 +0000 (05:47 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683661 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Jun 2015 16:15:38 +0000 (16:15 +0000)]
and we are 2.4.14-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683585 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Jun 2015 16:13:29 +0000 (16:13 +0000)]
Get ready to tag 2.4.13
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683583 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Jun 2015 14:35:39 +0000 (14:35 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683561 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 2 Jun 2015 23:44:19 +0000 (23:44 +0000)]
Merge r1683198 from trunk:
mod_proxy_scgi upgraders likely need to set proxy-scgi-pathinfo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683199 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Jun 2015 13:40:41 +0000 (13:40 +0000)]
Merge r1681795, r1682988, r1682979, r1682819, r1682816 from trunk:
initialize args to not print garbage mem during a RewriteRule parse error
Initialize args to not print garbage mem during a RewriteCond parse error (same as r1681795 for RewriteRule)
Improve style in examples.
Improve error message (related to PR57311 diagnostic)
Concat string at compile time in order to save a few cycles.
Submitted by: covener, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683113 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Jun 2015 13:39:26 +0000 (13:39 +0000)]
Merge r1681694, r1682907 from trunk:
mod_proxy: Don't put the worker in error state for 500 or 503 errors
returned by the backend unless failonstatus is configured to. PR 56925.
mod_proxy: follow up to r1681694.
Handle the proxy-error-override note also in mod_proxy_ajp.
The note is not needed in mod_proxy_fcgi (which also handles
ProxyErrorOverride) since it calls ap_die() by itself, and always
returns OK to proxy_handler().
Add a comment about the note where used.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683112 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Jun 2015 13:38:25 +0000 (13:38 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683111 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Jun 2015 13:38:03 +0000 (13:38 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683110 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 2 Jun 2015 13:05:42 +0000 (13:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683098 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 2 Jun 2015 12:03:05 +0000 (12:03 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1683082 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 1 Jun 2015 20:47:47 +0000 (20:47 +0000)]
Propose easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682998 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 15:54:37 +0000 (15:54 +0000)]
Xform.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682940 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 15:53:59 +0000 (15:53 +0000)]
Fix copy and paste docs error.
Backport of r1682937 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682939 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 15:34:11 +0000 (15:34 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682934 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 15:15:06 +0000 (15:15 +0000)]
Try to clarify extended uses of SSLCertificateFile.
Backport of r1682923 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682929 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 15:04:41 +0000 (15:04 +0000)]
Prune resolved discussion, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682924 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 1 Jun 2015 14:31:03 +0000 (14:31 +0000)]
Enlarge proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682914 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Jun 2015 12:40:51 +0000 (12:40 +0000)]
Merge r1629440, r1629441, r1681424, r1681440, r1681685 from trunk:
Style (mostly indent)
remove a useless local variable initialization
More style
Constify + save a few bytes in conf pool (+ some minor space adjustments)
Save a few bytes in conf pool and axe a function that duplicates 'ap_set_string_slot'
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@
1682889 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Jun 2015 12:39:56 +0000 (12:39 +0000)]
Merge r1682482 from trunk:
PR 57968: Don't lowercase the argument to SetHandler if the handler is
proxy:unix.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682888 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 11:06:39 +0000 (11:06 +0000)]
Vote, promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682872 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 31 May 2015 20:20:20 +0000 (20:20 +0000)]
Vote (easier to review with svn diff -x-w).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682790 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 31 May 2015 20:15:26 +0000 (20:15 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682787 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 May 2015 16:26:41 +0000 (16:26 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682620 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 May 2015 16:25:29 +0000 (16:25 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682619 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 29 May 2015 20:07:15 +0000 (20:07 +0000)]
core, modules: Avoid error response/document handling by the core if some
handler or input filter already did it while reading the request (causing
a double response body).
Submitted by: ylavic
Backports: r1482522 (partial, ap_map_http_request_error() things only!),
r1529988, r1529991, r1643537, r1643543, r1657897, r1665625,
r1665721, r1674056
Reviewed by: ylavic, minfrin, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682544 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 29 May 2015 14:25:02 +0000 (14:25 +0000)]
propose proxy:unix fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682486 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 29 May 2015 04:18:26 +0000 (04:18 +0000)]
This appears to be promoted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682362 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 29 May 2015 03:04:24 +0000 (03:04 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682360 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 May 2015 18:59:59 +0000 (18:59 +0000)]
Clarify the change to the default cipher suite lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682099 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 27 May 2015 17:00:13 +0000 (17:00 +0000)]
Add changelog entry for r1682074.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682077 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 May 2015 16:38:40 +0000 (16:38 +0000)]
Drop comment - dependency backport was committed 5-22
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682075 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 May 2015 16:33:10 +0000 (16:33 +0000)]
mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
SSL_CTX_set_tmp_ecdh increases reference count, so we have to call
EC_KEY_free, otherwise eckey will not be freed.
Backports: r1666363
Author: jkaluza
Reviewed by: rjung, ylavic, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682074 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 May 2015 15:36:52 +0000 (15:36 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1682059 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 14:19:46 +0000 (14:19 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681765 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 14:09:57 +0000 (14:09 +0000)]
v4 for ALPN proposal adding r1670738.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681764 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 13:24:58 +0000 (13:24 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681752 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 13:02:05 +0000 (13:02 +0000)]
v3 for ALPN proposal without one remaining HAVE_TLS_NPN stuff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681751 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 12:23:31 +0000 (12:23 +0000)]
Propose ALPN support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681749 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 07:02:41 +0000 (07:02 +0000)]
Vote (fix link).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681691 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 26 May 2015 06:55:44 +0000 (06:55 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681690 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 26 May 2015 06:37:08 +0000 (06:37 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681688 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 15:58:43 +0000 (15:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681601 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 15:57:30 +0000 (15:57 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681600 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 25 May 2015 14:33:08 +0000 (14:33 +0000)]
Merge r1679712 from trunk:
Follow up to r1679181: fix warning (return discards qualifiers from pointer target type).
Submitted by: ylavic
Reviewed by: trawick, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681590 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 25 May 2015 14:29:02 +0000 (14:29 +0000)]
remove my incorrect claim that we returned 400 in the wrong case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681589 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 24 May 2015 19:02:04 +0000 (19:02 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681518 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 24 May 2015 14:41:23 +0000 (14:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681467 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 24 May 2015 14:40:31 +0000 (14:40 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681466 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 May 2015 16:32:17 +0000 (16:32 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681366 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 May 2015 16:31:02 +0000 (16:31 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681365 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 23 May 2015 15:34:26 +0000 (15:34 +0000)]
Vote and express promote (since it is such
a simple change).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681358 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 23 May 2015 13:16:22 +0000 (13:16 +0000)]
Note that the OCSP stapling improvement partially addressed bug 57131.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681347 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 23 May 2015 11:56:20 +0000 (11:56 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681329 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 23 May 2015 11:20:18 +0000 (11:20 +0000)]
warnings :( but fix is already available from trunk :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681322 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 23 May 2015 11:13:21 +0000 (11:13 +0000)]
Merge r1679032, r1679192, and r1680276 from trunk:
r1679032:
mod_ssl OCSP Stapling: Don't block initial handshakes while refreshing
the OCSP response for a different certificate. mod_ssl has an additional
global mutex, "ssl-stapling-refresh".
Not mentioned in CHANGES:
Stapling no longer uses a mutex when using a stapling cache
implementation which doesn't require it. (A further, unrelated
code change to mod_ssl is required to allow the use of memcache
as a stapling cache, and I haven't tested with distcache; thus
it isn't clear if this helps in practice yet.)
r1679192:
Fix regression in check for cached response
(Essentially) Submitted by: ylavic
r1680276:
OCSP stapling: slight simplification to some internal interfaces,
add a few comments and sanity checks
Submitted by: trawick (with assist from ylavic)
Reviewed by: jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681320 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 23 May 2015 10:16:51 +0000 (10:16 +0000)]
Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681312 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 23 May 2015 10:16:25 +0000 (10:16 +0000)]
Merge r1420184 from trunk:
* modules/aaa/mod_authz_owner.h: Add header file with optional hook
declaration for "authz_owner_get_file_group".
* modules/aaa/mod_authz_dbm.c, modules/aaa/mod_authz_groupfile.c: Use
the header to pick up the above declaration; retrieve the optional
function in a hook; use a static variable to store the function
pointer.
Submitted by: jorton
Reviewed by: jkaluza, wrowe, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681311 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 23 May 2015 10:10:22 +0000 (10:10 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681309 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 May 2015 19:21:56 +0000 (19:21 +0000)]
extremely slow response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681199 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 May 2015 19:04:18 +0000 (19:04 +0000)]
minor tweaks for readability/grammar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681187 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 15:21:01 +0000 (15:21 +0000)]
Phases were correct, ignore me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681144 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 15:15:27 +0000 (15:15 +0000)]
jkaluza - need to move _retrieve calls from register to init/pre-config phase
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681143 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 22 May 2015 13:30:43 +0000 (13:30 +0000)]
Merge r1657881, r1665643 from trunk:
http: Make ap_die() robust against any HTTP error code and not modify
response status (finally logged) when nothing is to be done.
ap_die(): follow up to r1657881.
Use log level DEBUG for AP_FILTER_ERROR => HTTP_INTERNAL_SERVER_ERROR.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681114 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 22 May 2015 13:28:00 +0000 (13:28 +0000)]
Merge r1666998 from trunk:
core: Cleanup the request soon/even if some output filter fails to
handle the EOR bucket.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681113 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 22 May 2015 13:26:56 +0000 (13:26 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681112 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 22 May 2015 13:26:32 +0000 (13:26 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681109 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 22 May 2015 13:25:53 +0000 (13:25 +0000)]
Merge r1663647, r1679181, r1679182 from trunk:
* mod_authn_dbd: apr_pstrdup dbd_password and dbd_hash to fix use-after-free
bug with postgresql
mod_authn_dbd, mod_authz_dbd, mod_session_dbd, mod_rewrite: Fix lifetime
of DB lookup entries independently of the selected DB engine. PR 46421.
Suggested by: Michel Stam <michel reverze net>
Proposed by: Steven whitson <steven.whitson gmail com>
Reviewed/Extended/Committed by: ylavic
Follup up to r1679181: CHANGES entry.
Submitted by: jkaluza, ylavic, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681107 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 22 May 2015 13:24:18 +0000 (13:24 +0000)]
Merge r1680895, r1680900, r1680942 from trunk:
mod_log_config: instead of using the new dedicated
pattern format "%M" for duration milliseconds,
overload the existing "%D" to choose the time precision
("%{s}D" for seconds, "%{ms}D" for milliseconds and
"%{us}D" for microseconds).
The existing %T and %D without precision are kept for
compatibility.
The previously introduced "%M" (r1677187) is removed,
it has not yet been released. Format pattern characters
are rare, so we should only use a new one if an
existing one isn't a good fit.
Fix syntax.
Follow-up to r1680895:
Let %T be the format character which accepts time resolution
arguments.
Submitted by: rjung, trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681106 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:24:05 +0000 (08:24 +0000)]
Add backport revision.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681038 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:20:24 +0000 (08:20 +0000)]
Be more precise.
Backport of r1681037 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681034 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:07:39 +0000 (08:07 +0000)]
Me too, me too, ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681029 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 07:11:42 +0000 (07:11 +0000)]
Bumps. Yes - this - a clean 2.2 proposal please, TIA
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681011 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 07:04:44 +0000 (07:04 +0000)]
Concur with two proposals, drop any objection to yet a third proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1681008 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 22 May 2015 05:58:19 +0000 (05:58 +0000)]
Typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680998 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 20:20:08 +0000 (20:20 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680949 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 May 2015 19:38:42 +0000 (19:38 +0000)]
switch mod_log_config %{foo}D proposal to the %{foo}T update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680945 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 15:19:40 +0000 (15:19 +0000)]
Add a syntax fix for the docs.
Patch has been replaced in place, I guess noone
has yet reviewed it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680901 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 15:08:55 +0000 (15:08 +0000)]
Propose correction to new millisecond duration
feature in mod_log_config.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680897 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 10:32:49 +0000 (10:32 +0000)]
Remove outdated block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680811 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 19 May 2015 13:32:14 +0000 (13:32 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680287 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 May 2015 12:02:39 +0000 (12:02 +0000)]
note release date
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680262 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 19 May 2015 07:46:25 +0000 (07:46 +0000)]
Vote and propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1680196 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log