]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
10 years ago Vote up one patch, presume lazy concensus on second patch (platform specific
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

10 years agoEdit for consistency between 2.4 and 2.2 CHANGES forks
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

10 years agomod_ssl: Propose a more modern Cipher and Protocol list, honor server cipher
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: 16794281679432
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

10 years agoComments.
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

10 years agoMerge r1664205 from trunk.
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

10 years agoMerge r1526189, r1658765 from trunk.
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

10 years ago2.2.x only.
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

10 years agoMerge r1653997 from trunk.
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

10 years agoMerge r1526168, r1527291, r1527295, r1563420, r1588851, r1666363, r1679470
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

10 years agoBigger mod_log_config backport proposal?
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

10 years agoPropose.
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

10 years agoMerge r1200040, r1200372, r1200374, r1213380 from trunk.
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

10 years agoBe (possibly) more precise/clear.
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

10 years agoI'll -0+1 your -0+1 :p
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

10 years agoI'll +1 your -0
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

10 years agomod_proxy_ajp: Fix get_content_length().
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

10 years agoVote, promote, comment.
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

10 years agoPromote.
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

10 years agoVote (can you hear the logjam).
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

10 years ago* STATUS: Revote for r1675533.
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

10 years agoRe-propose r1675533.
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

10 years agoRedundancy here is not a bad thing, re-accept
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

10 years agoUpdate, vote.
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

10 years agoPromoted, lots of low-hanging fruit looking for one more eyeball (or eyeballs)
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

10 years agoPropose, upvote
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

10 years agoNote change made last week to make 2.2 consistent with 2.4 default config
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

10 years agoFor clarity, revert 1679429
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

10 years ago[REVERTED]
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

10 years agoPropose.
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

10 years agov1 with apr_time_now() option.
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

10 years agov4 with CHANGES entry.
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

10 years agoMore related things to get_request_end_time().
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

10 years agoPropose replacement for reverted r1678706.
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

10 years agoRevert r1678706: missing the get_request_end_time() part.
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

10 years agoPropose.
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

10 years agoPropose.
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

10 years agoMerge r900022 from trunk.
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

10 years agoMerge r1677462 from trunk.
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

10 years agoMerge r981084 from trunk.
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

10 years ago[REVERTED by r1679205]
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

10 years agoMerge r1650310, r1650320 from trunk.
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

10 years agodefault conf: Disable SSLv3, like SSLv2, in the default configuration.
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

10 years agomod_deflate: Define APR_INT32_MAX when it is missing so to be able to
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

10 years agoMerge r1621453 from trunk.
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

10 years agoBackport r819480 from trunk.
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

10 years agoVote, promote.
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

10 years agoFix double 2.2.x backport suggestions.
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

10 years agoPropose safety backport.
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

10 years agoVotes.
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

10 years agoEasy proposals (synch with trunk)
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

10 years agoPropose.
Yann Ylavic [Wed, 6 May 2015 22:51:49 +0000 (22:51 +0000)] 
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1678107 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote and promote.
Yann Ylavic [Tue, 5 May 2015 13:07:25 +0000 (13:07 +0000)] 
Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677816 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUnassociated correction, to globalize the default suggested SSLProtocol
William A. Rowe Jr [Tue, 5 May 2015 01:29:23 +0000 (01:29 +0000)] 
Unassociated correction, to globalize the default suggested SSLProtocol
directive disabling SSLv2.  Not strictly required since this is now the
global default.  This directive should travel with SSLCipherSuite, however
it no longer existed in the corresponding commits to trunk/ and 2.4.x/.

Applied C-T-R following docs/ process.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677722 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFollowing docs/ conventions, using C-T-R to correct unacceptable drift
William A. Rowe Jr [Tue, 5 May 2015 01:19:20 +0000 (01:19 +0000)] 
Following docs/ conventions, using C-T-R to correct unacceptable drift
between 2.4.x and 2.2.x, notably r966160 which was advertised as a cipher
list update, but was in fact a major scope change to global scope.

Backports: r966160
Submitted by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677721 13f79535-47bb-0310-9956-ffa450edef68

10 years ago* STATUS: Nominate r1677462
Ben Reser [Sun, 3 May 2015 18:30:46 +0000 (18:30 +0000)] 
* STATUS: Nominate r1677462

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677474 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild.
Lucien Gentis [Sun, 3 May 2015 16:37:18 +0000 (16:37 +0000)] 
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677449 13f79535-47bb-0310-9956-ffa450edef68

10 years agoXML update.
Lucien Gentis [Sun, 3 May 2015 16:36:29 +0000 (16:36 +0000)] 
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677448 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix typo. PR57879
Christophe Jaillet [Fri, 1 May 2015 11:57:34 +0000 (11:57 +0000)] 
Fix typo.  PR57879

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1677118 13f79535-47bb-0310-9956-ffa450edef68

10 years agoSame principal as r1676656 but fix Windows command line build files
Gregg Lewis Smith [Wed, 29 Apr 2015 02:32:37 +0000 (02:32 +0000)] 
Same principal as r1676656 but fix Windows command line build files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1676657 13f79535-47bb-0310-9956-ffa450edef68

10 years agomerge r1676654 from trunk
Gregg Lewis Smith [Wed, 29 Apr 2015 02:23:01 +0000 (02:23 +0000)] 
merge r1676654 from trunk

The increased use of UuidCreate() in APR 1.5.2+ introduces an unresolved
reference to UuidCreate() to these support applications that link with
apr-1.lib and do not already link rpcrt4.lib.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1676656 13f79535-47bb-0310-9956-ffa450edef68

10 years agoremove mod_ssl proposals which have been in the STALLED category for 20+ months
Kaspar Brand [Sun, 26 Apr 2015 07:38:25 +0000 (07:38 +0000)] 
remove mod_ssl proposals which have been in the STALLED category for 20+ months

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1676090 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote
Daniel Ruggeri [Sat, 25 Apr 2015 18:49:42 +0000 (18:49 +0000)] 
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1676052 13f79535-47bb-0310-9956-ffa450edef68

10 years ago* STATUS: Nominate r1675533
Ben Reser [Sat, 25 Apr 2015 00:45:38 +0000 (00:45 +0000)] 
* STATUS: Nominate r1675533

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675987 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Fri, 24 Apr 2015 19:44:21 +0000 (19:44 +0000)] 
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675940 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGenerated doc changes
Mike Rumph [Thu, 23 Apr 2015 17:05:26 +0000 (17:05 +0000)] 
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675684 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGrammar improvements in performance tuning doc
Mike Rumph [Thu, 23 Apr 2015 17:00:58 +0000 (17:00 +0000)] 
Grammar improvements in performance tuning doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675681 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGenerate doc changes
Mike Rumph [Thu, 23 Apr 2015 00:35:52 +0000 (00:35 +0000)] 
Generate doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675526 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1675441 from trunk:
Eric Covener [Wed, 22 Apr 2015 17:51:50 +0000 (17:51 +0000)] 
Merge r1675441 from trunk:

no --with-perl since 1.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675443 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGenerated doc changes
Mike Rumph [Tue, 21 Apr 2015 06:01:58 +0000 (06:01 +0000)] 
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675036 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGrammar improvements in performance tuning doc
Mike Rumph [Tue, 21 Apr 2015 05:56:46 +0000 (05:56 +0000)] 
Grammar improvements in performance tuning doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1675034 13f79535-47bb-0310-9956-ffa450edef68

10 years agorebuild docs with meta element enabled
André Malo [Fri, 17 Apr 2015 20:35:13 +0000 (20:35 +0000)] 
rebuild docs with meta element enabled

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1674395 13f79535-47bb-0310-9956-ffa450edef68

10 years agobackport http://svn.apache.org/r1674382
André Malo [Fri, 17 Apr 2015 20:03:16 +0000 (20:03 +0000)] 
backport http://svn.apache.org/r1674382

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1674390 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Fri, 17 Apr 2015 20:01:34 +0000 (20:01 +0000)] 
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1674389 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGenerated doc changes
Mike Rumph [Thu, 16 Apr 2015 05:27:57 +0000 (05:27 +0000)] 
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1674005 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix typo in mod_rewrite doc.
Mike Rumph [Thu, 16 Apr 2015 05:22:27 +0000 (05:22 +0000)] 
Fix typo in mod_rewrite doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1674004 13f79535-47bb-0310-9956-ffa450edef68

10 years agoWe need moar emails - format change
Daniel Ruggeri [Wed, 15 Apr 2015 17:04:53 +0000 (17:04 +0000)] 
We need moar emails - format change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1673876 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFlip directives and topics sections after discussion around ordering
Daniel Ruggeri [Wed, 15 Apr 2015 16:55:35 +0000 (16:55 +0000)] 
Flip directives and topics sections after discussion around ordering

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1673870 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuilds Daniel's change to the order of directictives vs topics in
Rich Bowen [Wed, 15 Apr 2015 16:36:04 +0000 (16:36 +0000)] 
Rebuilds Daniel's change to the order of directictives vs topics in
manual docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1673857 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdjust template to align page content with table of contents
Daniel Ruggeri [Wed, 15 Apr 2015 16:33:04 +0000 (16:33 +0000)] 
Adjust template to align page content with table of contents

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1673853 13f79535-47bb-0310-9956-ffa450edef68

10 years agoApplies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Rich Bowen [Wed, 15 Apr 2015 15:27:02 +0000 (15:27 +0000)] 
Applies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds
Norwegin translations of error pages

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1673827 13f79535-47bb-0310-9956-ffa450edef68

10 years agogenerated doc changes
Mike Rumph [Tue, 14 Apr 2015 23:14:07 +0000 (23:14 +0000)] 
generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1673581 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix typo introduced in r1669201
Christophe Jaillet [Wed, 1 Apr 2015 05:52:00 +0000 (05:52 +0000)] 
Fix typo introduced in r1669201

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1670567 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Sun, 29 Mar 2015 15:25:53 +0000 (15:25 +0000)] 
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1669926 13f79535-47bb-0310-9956-ffa450edef68

10 years agobackport "directive" placement option
André Malo [Sun, 29 Mar 2015 15:19:24 +0000 (15:19 +0000)] 
backport "directive" placement option

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1669921 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdding optional attribute before-name="yes"
Lucien Gentis [Fri, 27 Mar 2015 17:16:09 +0000 (17:16 +0000)] 
Adding optional attribute before-name="yes"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1669624 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild
Rich Bowen [Wed, 25 Mar 2015 18:40:49 +0000 (18:40 +0000)] 
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1669203 13f79535-47bb-0310-9956-ffa450edef68

10 years agohttp://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822
Rich Bowen [Wed, 25 Mar 2015 18:39:20 +0000 (18:39 +0000)] 
http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1669201 13f79535-47bb-0310-9956-ffa450edef68

10 years agovotes/promotes
Gregg Lewis Smith [Sat, 14 Mar 2015 01:36:54 +0000 (01:36 +0000)] 
votes/promotes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1666628 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote
Gregg Lewis Smith [Fri, 13 Mar 2015 21:44:42 +0000 (21:44 +0000)] 
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1666589 13f79535-47bb-0310-9956-ffa450edef68

10 years agoApprove of this spec-compliance fix on both living released branches
William A. Rowe Jr [Tue, 10 Mar 2015 21:59:25 +0000 (21:59 +0000)] 
Approve of this spec-compliance fix on both living released branches

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1665715 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose fix for PR 55892.
Yann Ylavic [Mon, 9 Mar 2015 13:30:50 +0000 (13:30 +0000)] 
Propose fix for PR 55892.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1665229 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild.
Lucien Gentis [Sat, 28 Feb 2015 16:24:19 +0000 (16:24 +0000)] 
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1662963 13f79535-47bb-0310-9956-ffa450edef68

10 years agoXML update.
Lucien Gentis [Sat, 28 Feb 2015 16:23:28 +0000 (16:23 +0000)] 
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1662962 13f79535-47bb-0310-9956-ffa450edef68

10 years agoxforms
Eric Covener [Tue, 24 Feb 2015 16:46:07 +0000 (16:46 +0000)] 
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1662020 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1662012 from trunk:
Eric Covener [Tue, 24 Feb 2015 16:45:12 +0000 (16:45 +0000)] 
Merge r1662012 from trunk:

improve some slightly awkward wording per comments feedback:

  http://httpd.apache.org/docs/2.4/configuring.html#comment_3678

The original can be read as applying to comments on a subsequent line.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1662017 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild.
Lucien Gentis [Sat, 21 Feb 2015 17:25:37 +0000 (17:25 +0000)] 
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1661411 13f79535-47bb-0310-9956-ffa450edef68

10 years agoXML update.
Lucien Gentis [Sat, 21 Feb 2015 17:24:44 +0000 (17:24 +0000)] 
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1661410 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix doc as spotted by Chris in online doc
Christophe Jaillet [Mon, 16 Feb 2015 19:40:22 +0000 (19:40 +0000)] 
Fix doc as spotted by Chris in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1660187 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose to backport SSLSessionTicketKeyFile.
Yann Ylavic [Mon, 9 Feb 2015 13:46:14 +0000 (13:46 +0000)] 
Propose to backport SSLSessionTicketKeyFile.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1658396 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote, promote, and update compatibility note (2.4 => 2.2) in SSLSessionTickets manual.
Yann Ylavic [Mon, 9 Feb 2015 09:48:37 +0000 (09:48 +0000)] 
Vote, promote, and update compatibility note (2.4 => 2.2) in SSLSessionTickets manual.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1658338 13f79535-47bb-0310-9956-ffa450edef68