]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Yann Ylavic [Wed, 17 Jun 2015 10:07:09 +0000 (10:07 +0000)]
Add PR to CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1685982 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 17 Jun 2015 09:53:16 +0000 (09:53 +0000)]
Propose mod_substitute merge order fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1685978 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 14 Jun 2015 01:24:09 +0000 (01:24 +0000)]
Propose same fix as of 2.4.14's regression.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1685355 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 12 Jun 2015 16:41:11 +0000 (16:41 +0000)]
Fix missing lib (.mak was previously updated)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1685125 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jun 2015 07:19:16 +0000 (07:19 +0000)]
Adjust IDs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684821 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 20:26:47 +0000 (20:26 +0000)]
Adjust URL for public consumption
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684520 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 20:25:53 +0000 (20:25 +0000)]
Offer a showstopper for 2.2.30 requiring one more reviewer/vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684519 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Jun 2015 16:09:28 +0000 (16:09 +0000)]
Merge r1585090 from trunk:
Bring SNI behavior into better conformance with RFC 6066:
- no longer send a warning-level unrecognized_name(112) alert
when no matching vhost is found (PR 56241)
<not backported to 2.2.x>
- at startup, only issue warnings about IP/port conflicts and name-based
SSL vhosts when running with an OpenSSL without TLS extension support
(almost 5 years after SNI was added to 2.2.x, the
"[...] only work for clients with TLS server name indication support"
warning feels obsolete)
</not backported to 2.2.x>
Proposed by: kbrand
Reviewed by: ylavic, jorton, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684462 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 15:41:01 +0000 (15:41 +0000)]
Yes, this. Vote & promote w/thanks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684457 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 15:39:25 +0000 (15:39 +0000)]
Revert mis-commit, re-fixing STATUS in a moment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684455 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jun 2015 15:37:40 +0000 (15:37 +0000)]
Yes, this. Vote & promote w/thanks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684454 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Jun 2015 08:56:25 +0000 (08:56 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684356 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Jun 2015 07:38:06 +0000 (07:38 +0000)]
Remove entry backported in r1683808 (along with dependent proposal).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684341 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Jun 2015 07:30:04 +0000 (07:30 +0000)]
Propose RFC 6066 (SNI) conformance fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1684336 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 5 Jun 2015 16:50:47 +0000 (16:50 +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, wrowe, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1683808 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Jun 2015 14:44:33 +0000 (14:44 +0000)]
vote/promote two remaining backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1683772 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 16:13:53 +0000 (16:13 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1682944 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 1 Jun 2015 16:01:49 +0000 (16:01 +0000)]
Try to clarify extended uses of SSLCertificateFile.
Backport of r1682923 and r1682937 from trunk,
resp. r1682929 and r1682939 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1682942 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 29 May 2015 04:19:16 +0000 (04:19 +0000)]
Vote up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1682363 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 27 May 2015 23:39:55 +0000 (23:39 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1682139 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.2.x@
1682099 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 16:00:14 +0000 (16:00 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681603 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 15:59:26 +0000 (15:59 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681602 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 25 May 2015 08:43:57 +0000 (08:43 +0000)]
Merge r1551685, r1652929 from trunk.
r1551685 | trawick | 2013-12-17 21:25:54 +0100 (Tue, 17 Dec 2013) | 5 lines
FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.
PR: 53824
r1652929 | ylavic | 2015-01-19 09:06:56 +0100 (Mon, 19 Jan 2015) | 4 lines
Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic
Reviewed by: ylavic, trawick, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681565 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 25 May 2015 02:47:21 +0000 (02:47 +0000)]
Vote for simple patch. Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681546 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 25 May 2015 00:31:07 +0000 (00:31 +0000)]
+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681540 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 24 May 2015 21:58:20 +0000 (21:58 +0000)]
... and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681532 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 24 May 2015 21:56:50 +0000 (21:56 +0000)]
Propose IPv4-mapped (configure) fix for freebsd 5+.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681531 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 23 May 2015 09:23:13 +0000 (09:23 +0000)]
Merged r979120 from trunk.
r979120 | rjung | 2010-07-25 23:08:15 +0200 (Sun, 25 Jul 2010) | 26 lines
Adding sub second timestamps and request end time to mod_log_config.
Add special format tokens to %{...}t. The extended syntax allows the
form: "WHICH:WHAT".
WHICH is either:
- "begin": use the time when the request started
- "end": take "now" as the time
You can omit WHICH, default is "begin".
If you omit WHICH, the separating column is not allowed.
WHAT is either:
- "sec": timestamp in Unix seconds
- "msec": timestamp in Unix milliseconds
- "msec_frac": millisecond fraction of the Unix timestamp,
3 digits, 0-padded
- "usec": timestamp in Unix microseconds
- "usec_frac": microsecond fraction of the Unix timestamp
6 digits, 0-padded
- anything different from those tokens: use strftime()
You can omit WHAT, default is the formatted timestamp as
used by the Common Log Format.
The implementation uses a new request_config for mod_log_config
to pass the request end time around between different calls to
log formatters, but the end time is only generated if needed.
Reviewed by: rjung, wrowe, ylavic
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681297 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 23 May 2015 08:34:44 +0000 (08:34 +0000)]
Merge r1665215, r1665218 from trunk.
r1665215 | ylavic | 2015-03-09 13:45:56 +0100 (Mon, 09 Mar 2015) | 8 lines
mod_proxy: use the original (non absolute) form of the request-line's URI
for requests embedded in CONNECT payloads used to connect SSL backends via
a ProxyRemote forward-proxy. PR 55892.
Submitted by: Hendrik Harms <hendrik.harms gmail com>
Reviewed by: wrowe, ylavic
Committed by: ylavic
r1665218 | ylavic | 2015-03-09 13:54:38 +0100 (Mon, 09 Mar 2015) | 1 line
mod_proxy: follow up to r1665215: CHANGES entry.
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681289 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 23 May 2015 08:19:04 +0000 (08:19 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681288 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 23 May 2015 07:03:36 +0000 (07:03 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681276 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 23 May 2015 07:00:21 +0000 (07:00 +0000)]
Add docs part to proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681275 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 23 May 2015 06:38:13 +0000 (06:38 +0000)]
mod_log_config: Backport get_request_end_time().
This makes data consistent if a log format uses
multiple %{...}T and/or %D.
The end time of a request is only taken once and
the same time is used for each log field.
Backport of r979120 (partial) plus r1467765 from trunk
resp. r979120 (partial) plus r1467981 from 2.4.x.
Committed By: rjung
Reviewed By: rjung, trawick, wrowe
Backported By: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681269 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 23 May 2015 05:25:22 +0000 (05:25 +0000)]
mpm_winnt: Accept utf-8 (Unicode) service names and descriptions for
internationalization.
Backports:
1611165 ,
1611169
Reviewed by: wrowe, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681266 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 23 May 2015 01:24:49 +0000 (01:24 +0000)]
Votes and a promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681255 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 May 2015 20:04:06 +0000 (20:04 +0000)]
+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681222 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 May 2015 19:05:37 +0000 (19:05 +0000)]
like r1681187 in 2.4.x: minor tweak for readability/grammar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681188 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 09:25:46 +0000 (09:25 +0000)]
Add two further mod_log_config proposals.
Not critical but nice to have.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681051 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 22 May 2015 08:53:31 +0000 (08:53 +0000)]
Merge r1675533, r1680895, r1680900, r1680942 from trunk.
r1675533 | breser | 2015-04-23 05:12:30 +0200 (Thu, 23 Apr 2015) | 3 lines
mod_log_config: Add %M format to output request duration in milliseconds.
r1680895 | rjung | 2015-05-21 17:07:15 +0200 (Thu, 21 May 2015) | 14 lines
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.
r1680900 | rjung | 2015-05-21 17:17:50 +0200 (Thu, 21 May 2015) | 2 lines
Fix syntax.
r1680942 | trawick | 2015-05-21 21:20:44 +0200 (Thu, 21 May 2015) | 5 lines
Follow-up to r1680895:
Let %T be the format character which accepts time resolution
arguments.
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681047 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 22 May 2015 08:45:24 +0000 (08:45 +0000)]
Merge r1663647, r1679182 from trunk.
r1663647 | jkaluza | 2015-03-03 12:12:18 +0100 (Tue, 03 Mar 2015) | 3 lines
* mod_authn_dbd: apr_pstrdup dbd_password and dbd_hash to fix use-after-free
bug with postgresql
r1679182 | ylavic | 2015-05-13 13:35:22 +0200 (Wed, 13 May 2015) | 1 line
Follup up to r1679181: CHANGES entry.
Reviewed by: ylavic, rjung, wrowe
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681044 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:26:44 +0000 (08:26 +0000)]
Add backport revision.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681039 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:21:36 +0000 (08:21 +0000)]
Be more precise.
docs = CTR.
Backport of r1681037 from trunk resp. r1681034 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681035 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:15:54 +0000 (08:15 +0000)]
Followup to r1680905:
Nearly all other directives use this quote style.
No real functional change, only info output.
Should be OK as CTR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681032 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:11:09 +0000 (08:11 +0000)]
comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681031 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:09:38 +0000 (08:09 +0000)]
Ready to rock.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681030 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 08:07:09 +0000 (08:07 +0000)]
Line wrap - fix my own most common misspelling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681028 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 08:04:03 +0000 (08:04 +0000)]
Favor, when scratching and reproposing, clear out the commentary? TIA
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681026 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 22 May 2015 07:53:00 +0000 (07:53 +0000)]
Follow up to r1681006: promote the right lazy concensus.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681024 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 22 May 2015 07:45:31 +0000 (07:45 +0000)]
Switch mod_log_config %M proposal to the %{foo}T update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681022 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 06:56:04 +0000 (06:56 +0000)]
Vote up one patch, presume lazy concensus on second patch (platform specific
with two affirmative reviewers)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681006 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 06:45:51 +0000 (06:45 +0000)]
Edit for consistency between 2.4 and 2.2 CHANGES forks
Submitted by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681003 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 22 May 2015 06:43:12 +0000 (06:43 +0000)]
mod_ssl: Propose a more modern Cipher and Protocol list, honor server cipher
priority and add explanations relative to RFC 7525 guidance.
Submitted by: wrowe
Backports:
1679428 ,
1679432
Reviewed by: wrowe, ylavic, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681002 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 19:33:05 +0000 (19:33 +0000)]
Comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680944 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 16:47:38 +0000 (16:47 +0000)]
Merge r1664205 from trunk.
Preventive backport, 2.2.x not concerned by CVE-2015-0253.
r1664205 | covener | 2015-03-05 03:33:16 +0100 (Thu, 05 Mar 2015) | 12 lines
*) SECURITY: CVE-2015-0253 (cve.mitre.org)
core: Fix a crash introduced in with ErrorDocument 400 pointing
to a local URL-path with the INCLUDES filter active, introduced
in 2.4.11. PR 57531. [Yann Ylavic]
Submitted By: ylavic
Committed By: covener
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680927 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 16:35:11 +0000 (16:35 +0000)]
Merge r1526189, r1658765 from trunk.
r1526189 | trawick | 2013-09-25 16:29:02 +0200 (Wed, 25 Sep 2013) | 8 lines
mod_proxy: Add ap_connection_reusable() for checking if a connection
is reusable as of this point in processing.
mod_proxy_fcgi uses the new API to determine if FCGI_CONN_CLOSE
should be enabled, but that doesn't change existing behavior
since the connection is currently marked for closure elsewhere
in the module.
r1658765 | ylavic | 2015-02-10 18:25:54 +0100 (Tue, 10 Feb 2015) | 4 lines
mod_proxy_http: Use the "Connection: close" header for requests to
backends not recycling connections (disablereuse), including the default
reverse and forward proxies.
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680923 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 16:24:30 +0000 (16:24 +0000)]
2.2.x only.
mod_proxy: Reuse proxy/balancer workers' parameters and scores across
graceful restarts, even if new workers are added, old ones removed, or
the order changes.
Proposed by: jkaluza
Reviewed by: ylavic, jkaluza, wrowe
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680920 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 16:11:41 +0000 (16:11 +0000)]
Merge r1653997 from trunk.
r1653997 | ylavic | 2015-01-22 19:37:06 +0100 (Thu, 22 Jan 2015) | 7 lines
mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).
Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680917 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 16:05:51 +0000 (16:05 +0000)]
Merge r1526168, r1527291, r1527295, r1563420, r1588851, r1666363, r1679470
r1526168 | kbrand | 2013-09-25 14:52:35 +0200 (Wed, 25 Sep 2013) | 21 lines
Streamline ephemeral key handling:
- drop support for ephemeral RSA keys (only allowed/needed
for export ciphers)
- drop pTmpKeys from the per-process SSLModConfigRec, and remove
the temp key generation at startup (unnecessary for DHE/ECDHE)
- unconditionally disable null and export-grade ciphers by always
prepending "!aNULL:!eNULL:!EXP:" to any cipher suite string
- do not configure per-connection SSL_tmp_*_callbacks, as it is
sufficient to set them for the SSL_CTX
- set default curve for ECDHE at startup, obviating the need
for a per-handshake callback, for the time being (and also
configure SSL_OP_SINGLE_ECDH_USE, previously left out)
For additional background, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%
3C52358ED1 .
2070704 @velox.ch%3E
r1527291 | kbrand | 2013-09-29 11:36:31 +0200 (Sun, 29 Sep 2013) | 9 lines
Follow-up fixes for r1526168:
- drop SSL_TMP_KEY_* constants from ssl_private.h, too
- make sure we also disable aNULL, eNULL and EXP ciphers
for per-directory SSLCipherSuite directives
- apply the same treatment to SSLProxyCipherSuite
r1527295 | kbrand | 2013-09-29 12:35:46 +0200 (Sun, 29 Sep 2013) | 20 lines
Improve ephemeral key handling (companion to r1526168):
- allow to configure custom DHE or ECDHE parameters via the
SSLCertificateFile directive, and adapt its documentation
accordingly (addresses PR 49559)
- add standardized DH parameters from RFCs 2409 and 3526,
use them based on the length of the certificate's RSA/DSA key,
and add a FAQ entry for clients which limit DH support
to 1024 bits (such as Java 7 and earlier)
- move ssl_dh_GetParamFromFile() from ssl_engine_dh.c to
ssl_util_ssl.c, and add ssl_ec_GetParamFromFile()
- drop ssl_engine_dh.c from mod_ssl
For the standardized DH parameters, OpenSSL version 0.9.8a
or later is required, which was therefore made a new minimum
requirement in r1527294.
r1563420 | kbrand | 2014-02-01 15:04:23 +0100 (Sat, 01 Feb 2014) | 3 lines
enable auto curve selection for ephemeral ECDH keys
when compiled against OpenSSL 1.0.2 or later
r1588851 | kbrand | 2014-04-21 08:39:24 +0200 (Mon, 21 Apr 2014) | 3 lines
ssl_callback_TmpDH: for OpenSSL 1.0.2 and later, set the current cert to the
one actually used for the connection before calling SSL_get_privatekey(ssl)
r1666363 | jkaluza | 2015-03-13 08:32:46 +0100 (Fri, 13 Mar 2015) | 4 lines
* 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.
r1679470 | ylavic | 2015-05-15 00:38:20 +0200 (Fri, 15 May 2015) | 5 lines
mod_ssl: follow up to r1527291.
Always prepend "!aNULL:!eNULL:" to SSL_DEFAULT_CIPHER_LIST (default for
SSL[Proxy]CipherSuite) since we support OpenSSL versions where this was
not yet included by default.
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680916 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 15:44:59 +0000 (15:44 +0000)]
Bigger mod_log_config backport proposal?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680913 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 15:35:34 +0000 (15:35 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680912 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 15:27:54 +0000 (15:27 +0000)]
Merge r1200040, r1200372, r1200374, r1213380 from trunk.
r1200040 | pquerna | 2011-11-10 00:37:37 +0100 (Thu, 10 Nov 2011) | 5 lines
Add support for RFC 5077 TLS Session tickets. This adds two new directives:
* SSLTicketKeyFile: To store the private information for the encryption of the ticket.
* SSLTicketKeyDefault To set the default, otherwise the first listed token is used. This enables key rotation across servers.
r1200372 | pquerna | 2011-11-10 16:17:18 +0100 (Thu, 10 Nov 2011) | 4 lines
Apply ap_server_root_relative to the path used for the ticket secrets file.
Suggested by: Rüdiger Plüm
r1200374 | pquerna | 2011-11-10 16:19:15 +0100 (Thu, 10 Nov 2011) | 4 lines
Remove unneeded memcpy.
Spotted by: Rüdiger Plüm
r1213380 | kbrand | 2011-12-12 20:21:35 +0100 (Mon, 12 Dec 2011) | 9 lines
Streamline TLS session ticket key handling (added in r1200040):
- drop the SSLTicketKeyDefault directive, and only support a single
ticket key per server/vhost
- rename the SSLTicketKeyFile directive to SSLSessionTicketKeyFile,
remove the keyname parameter
- move ticket key parameters from SSLSrvConfigRec to modssl_ctx_t
- configure the tlsext_ticket_key_cb only when in server mode
- add documentation for SSLSessionTicketKeyFile
Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680905 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 14:32:39 +0000 (14:32 +0000)]
Be (possibly) more precise/clear.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680889 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 21 May 2015 14:27:23 +0000 (14:27 +0000)]
I'll -0+1 your -0+1 :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680885 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 May 2015 12:18:14 +0000 (12:18 +0000)]
I'll +1 your -0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680846 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 10:43:20 +0000 (10:43 +0000)]
mod_proxy_ajp: Fix get_content_length().
clength in request_rec is for response sizes, not
request body size. It is initialized to 0, so the
"if" branch was never taken and thus there's no
functional change (and no CHANGES).
Backport of r1649043 from trunk resp. r1651096 from 2.4.x.
Committed By: rjung
Reviewed By: rjung, ylavic, wrowe
Backported By: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680815 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 10:30:27 +0000 (10:30 +0000)]
Vote, promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680810 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 10:19:17 +0000 (10:19 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680804 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 10:16:10 +0000 (10:16 +0000)]
Vote (can you hear the logjam).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680803 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Tue, 19 May 2015 04:23:01 +0000 (04:23 +0000)]
* STATUS: Revote for r1675533.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1680162 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 16 May 2015 08:38:02 +0000 (08:38 +0000)]
Re-propose r1675533.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679705 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 15 May 2015 15:10:02 +0000 (15:10 +0000)]
Redundancy here is not a bad thing, re-accept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679593 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 14 May 2015 23:16:22 +0000 (23:16 +0000)]
Update, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679474 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 19:17:46 +0000 (19:17 +0000)]
Promoted, lots of low-hanging fruit looking for one more eyeball (or eyeballs)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679438 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 19:15:31 +0000 (19:15 +0000)]
Propose, upvote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679433 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 18:53:35 +0000 (18:53 +0000)]
Note change made last week to make 2.2 consistent with 2.4 default config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679431 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 18:53:07 +0000 (18:53 +0000)]
For clarity, revert
1679429
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679430 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 18:51:58 +0000 (18:51 +0000)]
[REVERTED]
Note change made last week to make 2.2 consistent with 2.4 default config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679429 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 15:10:20 +0000 (15:10 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679222 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 14:05:44 +0000 (14:05 +0000)]
v1 with apr_time_now() option.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679215 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 13:56:14 +0000 (13:56 +0000)]
v4 with CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679212 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 13:47:58 +0000 (13:47 +0000)]
More related things to get_request_end_time().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679209 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 13:39:23 +0000 (13:39 +0000)]
Propose replacement for reverted r1678706.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679206 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 13:22:09 +0000 (13:22 +0000)]
Revert r1678706: missing the get_request_end_time() part.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679205 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 12:33:46 +0000 (12:33 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679193 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 12:04:59 +0000 (12:04 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1679185 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 10:02:04 +0000 (10:02 +0000)]
Merge r900022 from trunk.
Turn static function get_server_name_for_url() into public function
ap_get_server_name_for_url() and use it where appropriate. This fixes
mod_rewrite generating invalid URLs for redirects to IPv6 literal addresses.
Committed by: sf
Reviewed by: jailletc36, ylavic, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678714 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:53:38 +0000 (09:53 +0000)]
Merge r1677462 from trunk.
mod_dav: Avoid doing the walk on a COPY source for handling preconditions if
there are no preconditions provided.
* modules/dav/main/util.c:
(dav_validate_request): avoid validating locks and ETags when there are
no If headers providing them on a resource we aren't modifying.
Committed by: breser
Reviewed by: breser, ylavic, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678710 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:49:15 +0000 (09:49 +0000)]
Merge r981084 from trunk.
Update docs and comment: the unique id is now 24 characters, not 19
Submitted by: Takashi Sato <takashi lans-tv com>, Stefan Fritsch
PR: 36269
Committed by: sf
Reviewed by: jailletc36, ylavic, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678709 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:40:52 +0000 (09:40 +0000)]
[REVERTED by r1679205]
Merge r1675533 from trunk.
mod_log_config: Add %M format to output request duration in milliseconds.
Committed by: breser
Reviewed by: breser, druggeri, ylavic
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678706 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:32:13 +0000 (09:32 +0000)]
Merge r1650310, r1650320 from trunk.
Add SSLSessionTickets (on|off).
It controls the use of TLS session tickets
(RFC 5077). Default is unchanged (on).
Using session tickets without restarting
the web server with an appropriate frequency
(e.g. daily) compromises perfect forward
secrecy.
As long as we do not have a nice key management
there should be a way to deactivate session
tickets.
Fix copy and paste error in docs of new feature.
Committed by: rjung
Reviewed by: ylavic, rjung, gsmith
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678703 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:21:58 +0000 (09:21 +0000)]
default conf: Disable SSLv3, like SSLv2, in the default configuration.
Committed by: covener
Reviewed by: covener, ylavic, gsmith
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678700 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:15:20 +0000 (09:15 +0000)]
mod_deflate: Define APR_INT32_MAX when it is missing so to be able to
compile against APR-1.2.x (minimum required version).
Committed by: ylavic
Reviewed by: ylavic, trawick, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678699 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:07:56 +0000 (09:07 +0000)]
Merge r1621453 from trunk.
PR56729: mod_reqtimeout gets confused when it sees a read via
check_pipeline() just before a slow HTTP response completes.
Committed By: coverner
Reviewed By: covener, trawick, ylavic
Backported By: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678698 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 11 May 2015 09:01:45 +0000 (09:01 +0000)]
Backport r819480 from trunk.
* include/httpd.h: Fix comment implying that LimitRequestLine
and LimitRequestFieldsize cannot raise limits -- no longer the
case.
Committed By: jorton
Reviewed By: covener, ylavic, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678697 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 10 May 2015 20:57:56 +0000 (20:57 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678643 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 10 May 2015 19:42:32 +0000 (19:42 +0000)]
Fix double 2.2.x backport suggestions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678596 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 10 May 2015 19:38:38 +0000 (19:38 +0000)]
Propose safety backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678595 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 10 May 2015 15:50:59 +0000 (15:50 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678570 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 9 May 2015 14:09:05 +0000 (14:09 +0000)]
Easy proposals (synch with trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1678492 13f79535 -47bb-0310-9956-
ffa450edef68