]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
6 years agoMerge r1841218 from trunk: tlsv1.3-for-2.4.x tlsv1.3-for-2.4.x
Joe Orton [Tue, 18 Sep 2018 11:09:15 +0000 (11:09 +0000)] 
Merge r1841218 from trunk:

* modules/ssl/ssl_engine_kernel.c (ssl_check_post_client_verify):
  Retrieve and set sslconn->client_cert here for both "modern" and
  classic access control.
  (ssl_hook_Access_classic, ssl_hook_Access_modern, ssl_hook_Access):
  Restore SSLRequire and FakeBasicAuth checks to ssl_hook_Access so tests
  are still applied for TLSv1.3.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1841219 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1840710 from trunk:
Joe Orton [Wed, 12 Sep 2018 15:54:59 +0000 (15:54 +0000)] 
Merge r1840710 from trunk:

* modules/ssl/ssl_engine_init.c (ssl_init_ctx_protocol):
  Disable AUTO_RETRY mode for OpenSSL 1.1.1, which fixes
  post-handshake authentication.
  (ssl_init_proxy_certs): Fix proxy client cert support with
  TLSv1.3, which is now crippled by default.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1840711 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1840585 from trunk:
Joe Orton [Wed, 12 Sep 2018 11:52:21 +0000 (11:52 +0000)] 
Merge r1840585 from trunk:

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Fail with
  403 if SSL_verify_client_post_handshake() fails, e.g. when the
  TLS/1.3 client didn't send the Post-Handshake Authentication
  extension.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1840664 13f79535-47bb-0310-9956-ffa450edef68

6 years agoadding revisions after review by jorton
Stefan Eissing [Tue, 11 Sep 2018 08:41:56 +0000 (08:41 +0000)] 
adding revisions after review by jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1840530 13f79535-47bb-0310-9956-ffa450edef68

6 years agoOn the tlsv1.3-for-2.4.x branch:
Stefan Eissing [Wed, 5 Sep 2018 11:28:15 +0000 (11:28 +0000)] 
On the tlsv1.3-for-2.4.x branch:

Merged 1827912,1827924,1827992,1828222,1828720,1828723,1833588,1833589,1839920,1839946 from trunk

  *) mod_ssl: add experimental support for TLSv1.3 (tested with OpenSSL v1.1.1-pre9.
     SSL(Proxy)CipherSuite now has an optional first parameter for the protocol the ciphers are for.
     Directive "SSLVerifyClient" now triggers certificate retrieval from the client.
     Verifying the client fails exactly the same for HTTP/2 connections for all SSL protocols,
     as this would need to trigger the master connection thread - which we do not support
     right now.
     Renegotiation of ciphers is intentionally ignored for TLSv1.3 connections. "SSLCipherSuite"
     does not allow to specify TLSv1.3 ciphers in a directory context (because it cannot work) and
     TLSv1.2 or lower ciphers are not relevant for 1.3, as cipher suites are completely separate.
     Sites which make use of such TLSv1.2 feature need to evaluate carefully if or how they
     can match their needs onto the TLSv1.3 protocol.
     [Yann Ylavic, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1840120 13f79535-47bb-0310-9956-ffa450edef68

6 years agofeature branch for backport TLSv1.3 changes to mod_ssl back to 2.4.x
Stefan Eissing [Wed, 5 Sep 2018 08:48:05 +0000 (08:48 +0000)] 
feature branch for backport TLSv1.3 changes to mod_ssl back to 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1840105 13f79535-47bb-0310-9956-ffa450edef68

6 years agoTransforms.
Joe Orton [Wed, 5 Sep 2018 07:44:30 +0000 (07:44 +0000)] 
Transforms.

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

6 years agomod_status: Use APR apr_time_as_msec() macro for
Rainer Jung [Tue, 4 Sep 2018 11:19:35 +0000 (11:19 +0000)] 
mod_status: Use APR apr_time_as_msec() macro for
conversion from apr_time_t to milliseconds instead
of hard-coded division by 1000.

Backport of r1839780 from trunk.

Submitted by: rjung
Reviewed by: rjung, rpluem, jim

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

6 years agopromote
Jim Jagielski [Tue, 4 Sep 2018 10:37:27 +0000 (10:37 +0000)] 
promote

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

6 years agovote
Jim Jagielski [Tue, 4 Sep 2018 10:37:00 +0000 (10:37 +0000)] 
vote

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

6 years ago* Vote
Ruediger Pluem [Mon, 3 Sep 2018 07:49:08 +0000 (07:49 +0000)] 
* Vote

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

6 years agoPropose.
Rainer Jung [Fri, 31 Aug 2018 19:16:55 +0000 (19:16 +0000)] 
Propose.

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

6 years agomod_status: Add cumulated response duration time
Rainer Jung [Fri, 31 Aug 2018 19:13:38 +0000 (19:13 +0000)] 
mod_status: Add cumulated response duration time
in milliseconds.

Backport of remaining parts of r1837590 from trunk
(only html mode changes, auto parts were already
backported).

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

6 years agomod_proxy: Improve the balancer member data shown
Rainer Jung [Fri, 31 Aug 2018 19:09:50 +0000 (19:09 +0000)] 
mod_proxy: Improve the balancer member data shown
in mod_status when "ProxyStatus" is "On":
add "busy" count to html mode.

Backport of remaining parts of r1837588 from trunk
(only html mode changes, auto parts were already
backported).

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

6 years agoPropose.
Yann Ylavic [Wed, 29 Aug 2018 14:10:38 +0000 (14:10 +0000)] 
Propose.

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

6 years agoAdd the remaining parts of my proxy-statusa and
Rainer Jung [Wed, 29 Aug 2018 03:41:51 +0000 (03:41 +0000)] 
Add the remaining parts of my proxy-statusa and
server-status proposals back to the list.

I have only applied the uncontroversial "auto"
mode part of the accepted patches.

The "html" part is now back in STATUS (with
adjusted smaller patches) to give some more
time for feedback whether the HTML output
format is allowed to change during a patch
release.

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

6 years agoFix unintended change to HTML server-status
Rainer Jung [Wed, 29 Aug 2018 03:27:17 +0000 (03:27 +0000)] 
Fix unintended change to HTML server-status
format.

Followon to r1839533.

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

6 years agomod_status: Add cumulated response duration time
Rainer Jung [Wed, 29 Aug 2018 03:09:18 +0000 (03:09 +0000)] 
mod_status: Add cumulated response duration time
in milliseconds to auto mode.

Partial backport of r1839532 from trunk
(only auto mode changes, html parts not yet
backported).

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

6 years agomod_proxy: Improve the balancer member data shown
Rainer Jung [Wed, 29 Aug 2018 02:50:30 +0000 (02:50 +0000)] 
mod_proxy: Improve the balancer member data shown
in mod_status when "ProxyStatus" is "On":
add "busy" count to auto mode and show byte counts
in auto mode always in units of kilobytes.

Partial backport of r1837588 from trunk
(only auto mode changes, html parts not yet
backported).

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

6 years agomod_status: Cumulate CPU time of exited child
Rainer Jung [Wed, 29 Aug 2018 02:43:40 +0000 (02:43 +0000)] 
mod_status: Cumulate CPU time of exited child
processes in the "cu" and "cs" values.
Add CPU time of the parent process to the
"c" and "s" values.

Backport of r1837595 from trunk.

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

6 years agomod_status: Complete the data shown for async
Rainer Jung [Wed, 29 Aug 2018 02:23:36 +0000 (02:23 +0000)] 
mod_status: Complete the data shown for async
MPMs in "auto" mode.  Added number of processes,
number of stopping processes and number
of busy and idle workers.

This changes only the key/value list of the
server-status "auto" output. The data is already
part of the "html" output.

Backport of r1837589 from trunk.

Submitted by: rjung
Reviewed by: rjung, jim, ylavic

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

6 years agoVote, promote.
Yann Ylavic [Tue, 28 Aug 2018 20:11:39 +0000 (20:11 +0000)] 
Vote, promote.

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

6 years agoMerge r1837130 from trunk:
Yann Ylavic [Tue, 28 Aug 2018 20:07:07 +0000 (20:07 +0000)] 
Merge r1837130 from trunk:

mod_ratelimit: Don't interfere with "chunked" encoding.

By the time ap_http_header_filter() sends the header brigade and adds the
"CHUNK" filter, we need to garantee that the header went through all the
filters' stack, and more specifically above ap_http_chunk_filter() which
assumes that all it receives is content data.
Since rate_limit_filter() may retain the header brigade, make it run after
ap_http_chunk_filter(), just before AP_FTYPE_CONNECTION filters.

Also, ap_http_header_filter() shouldn't eat the EOS for HEAD/no-body responses.
For instance mod_ratelimit depends on it since r1835168, but any next request
filter may as well to flush and/or bail out approprietely.

This fixes the regression introduced in 2.4.34 (r1835168).
PR 62568.

Submitted by: ylavic
Reviewed by: covener, ylavic, jim

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

6 years agoVote, promote, comment.
Yann Ylavic [Tue, 28 Aug 2018 13:56:42 +0000 (13:56 +0000)] 
Vote, promote, comment.

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

6 years agoFix proposal for ssl_io_filter_error() w.r.t. mod_proxy.
Yann Ylavic [Tue, 28 Aug 2018 12:56:41 +0000 (12:56 +0000)] 
Fix proposal for ssl_io_filter_error() w.r.t. mod_proxy.

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

6 years agoRebuil fr doc.
Lucien Gentis [Tue, 28 Aug 2018 12:26:12 +0000 (12:26 +0000)] 
Rebuil fr doc.

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

6 years agoXML updates.
Lucien Gentis [Tue, 28 Aug 2018 12:25:21 +0000 (12:25 +0000)] 
XML updates.

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

6 years agooops... remove one already covered
Jim Jagielski [Mon, 27 Aug 2018 13:53:07 +0000 (13:53 +0000)] 
oops... remove one already covered

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

6 years agoMore backports
Jim Jagielski [Mon, 27 Aug 2018 13:52:39 +0000 (13:52 +0000)] 
More backports

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

6 years agobackport prop vote
Jim Jagielski [Mon, 27 Aug 2018 13:24:52 +0000 (13:24 +0000)] 
backport prop vote

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

6 years agobackport prop
Jim Jagielski [Mon, 27 Aug 2018 12:44:13 +0000 (12:44 +0000)] 
backport prop

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

6 years agoAdd some more modules that use mod_watchdog
Christophe Jaillet [Sun, 26 Aug 2018 21:17:20 +0000 (21:17 +0000)] 
Add some more modules that use mod_watchdog
r1839250 in trunk

+ remove some trailing spaces to synch with trunk
+ add the optional [s] in WatchdogInterval syntax

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

6 years agoAdd missing space
Christophe Jaillet [Sun, 26 Aug 2018 20:29:47 +0000 (20:29 +0000)] 
Add missing space
(r1839245 on trunk)

+ remove some trailling spaces to synch with trunk

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

6 years agoUse the default location to display a default value
Christophe Jaillet [Fri, 24 Aug 2018 20:22:44 +0000 (20:22 +0000)] 
Use the default location to display a default value

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

6 years agoFix an example (/foo vs /foo/bar)
Christophe Jaillet [Fri, 24 Aug 2018 19:49:59 +0000 (19:49 +0000)] 
Fix an example (/foo vs /foo/bar)

Synch with trunk and improve alignment in examples.

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

6 years agocomment change... no functional
Jim Jagielski [Fri, 24 Aug 2018 19:48:29 +0000 (19:48 +0000)] 
comment change... no functional

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

6 years agopromote
Jim Jagielski [Fri, 24 Aug 2018 13:06:50 +0000 (13:06 +0000)] 
promote

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

6 years agovotes
Jim Jagielski [Fri, 24 Aug 2018 13:06:30 +0000 (13:06 +0000)] 
votes

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

6 years agovoted
Jim Jagielski [Fri, 24 Aug 2018 13:06:11 +0000 (13:06 +0000)] 
voted

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

6 years agovote
Eric Covener [Fri, 24 Aug 2018 12:36:37 +0000 (12:36 +0000)] 
vote

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

6 years agoVote.
Yann Ylavic [Wed, 22 Aug 2018 22:56:33 +0000 (22:56 +0000)] 
Vote.

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

6 years agoadd to status while I test
Eric Covener [Wed, 22 Aug 2018 19:15:24 +0000 (19:15 +0000)] 
add to status while I test

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

6 years agoforgot to add vote
Eric Covener [Wed, 22 Aug 2018 18:49:42 +0000 (18:49 +0000)] 
forgot to add vote

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

6 years agoVote and promote
William A. Rowe Jr [Wed, 22 Aug 2018 17:22:27 +0000 (17:22 +0000)] 
Vote and promote

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

6 years agopropose fix for 2.4.34 regression
Eric Covener [Mon, 20 Aug 2018 20:52:27 +0000 (20:52 +0000)] 
propose fix for 2.4.34 regression

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

6 years agoBackport r1786113 (Wording/formatting/typo fixes.)
Christophe Jaillet [Mon, 20 Aug 2018 19:48:59 +0000 (19:48 +0000)] 
Backport r1786113 (Wording/formatting/typo fixes.)

+ s/require/Require/ to help syntax color highlight work correctly. (r1838458 + r1838459 in trunk)

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

6 years agoRebuild.
Lucien Gentis [Sat, 18 Aug 2018 15:50:50 +0000 (15:50 +0000)] 
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sat, 18 Aug 2018 15:49:58 +0000 (15:49 +0000)] 
XML updates.

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

6 years ago- Add some links.
Christophe Jaillet [Sat, 18 Aug 2018 07:56:02 +0000 (07:56 +0000)] 
- Add some links.
- Remove the space in "character set" in the syntax of ProxyFtpDirCharset to avoid confusion (it is 1 parameter only)
- Use the correct syntax for the "default" values, so that they are parsed and correctly displayed in 'quickreference'
- Remove extra [] when directive's parameter are required

- correct the default password: apache-proxy@ instead of apache_proxy@.
This was silently changed in r88745, 17 years ago!

(r1838313 in trunk + some style to synch 2.4.x and trunk)

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

6 years agoMerge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772...
Jim Jagielski [Wed, 15 Aug 2018 15:01:08 +0000 (15:01 +0000)] 
Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk:

Don't claim "BIO dump follows" if it is not logged due to log level config.

make ssl_io_data_dump respect per-conn loglevel

add high trace level log messages for debugging buffering and write completion

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail
  if RAND_bytes() fails; possible per API, although not in practice
  with the OpenSSL implementation.

Fix typo in log message.

ap_add_common_vars(): use apr_pstrmemdup().

This avoids a transient replacement/restore of '?' by '\0' in r->filename.

Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:
    has_body = (!r->header_only
                && (r->kept_body
                    || apr_table_get(r->headers_in, "Transfer-Encoding")
                    || ( (cls = apr_table_get(r->headers_in, "Content-Length"))
                        && (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)
                        && (!*estr)
                        && (cl > 0) )
                    )
                );
So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

PR62368: Print the unparsed URI in AH03454

... to include r->args and get otherwise get as close to possible to
what came in over the wire.

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener

All error handling paths of this function call 'apr_brigade_destroy()' , except this one.
So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53016

* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool
  for debugging unless debug-level logging is enabled.  No functional change.

mod_watchdog: Correct some log messages and fix
compiler warning
"'rv' may be used uninitialized in this function".

Follow up to r1722154.

Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung
Reviewed by: jailletc36, jim, jorton

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

6 years agoMerge r1801143 from trunk:
Jim Jagielski [Wed, 15 Aug 2018 14:52:43 +0000 (14:52 +0000)] 
Merge r1801143 from trunk:

mpm_winnt: Don't forget to close the I/O completion port as part of the
cleanup in the child process.

Submitted by: kotkov
Reviewed by: jailletc36, ylavic (by inspection), covener

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

6 years agoMerge r1797844 from trunk:
Eric Covener [Tue, 14 Aug 2018 21:03:42 +0000 (21:03 +0000)] 
Merge r1797844 from trunk:

allow quoted paths in <IfFile>

The boilerplate code for config sections conflicts with TAKE1
because of the trailing stuff to terminate the opening tag.

Change from TAKE1 to RAW_ARGS and call ap_getword_conf()
directly.

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

6 years agoMerge r1809135 from trunk:
Eric Covener [Tue, 14 Aug 2018 20:56:54 +0000 (20:56 +0000)] 
Merge r1809135 from trunk:

On the trunk:

mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger.

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

6 years agoVote+promote.
Joe Orton [Tue, 14 Aug 2018 17:32:23 +0000 (17:32 +0000)] 
Vote+promote.

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

6 years agoand promote those with 3 +1s
Jim Jagielski [Tue, 14 Aug 2018 12:21:52 +0000 (12:21 +0000)] 
and promote those with 3 +1s

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

6 years agobackport votes
Jim Jagielski [Tue, 14 Aug 2018 12:21:13 +0000 (12:21 +0000)] 
backport votes

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

6 years agoPropose
Christophe Jaillet [Fri, 10 Aug 2018 20:30:07 +0000 (20:30 +0000)] 
Propose

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

6 years agovote
Eric Covener [Fri, 10 Aug 2018 13:39:56 +0000 (13:39 +0000)] 
vote

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

6 years agoPropose
Christophe Jaillet [Fri, 10 Aug 2018 03:35:34 +0000 (03:35 +0000)] 
Propose

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

6 years agoVote.
Rainer Jung [Wed, 8 Aug 2018 17:20:35 +0000 (17:20 +0000)] 
Vote.

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

6 years agoquick fix
Eric Covener [Wed, 8 Aug 2018 14:53:56 +0000 (14:53 +0000)] 
quick fix

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

6 years agoMerge r1836469, r1836154 from trunk:
Jim Jagielski [Wed, 8 Aug 2018 11:48:15 +0000 (11:48 +0000)] 
Merge r1836469, r1836154 from trunk:

* config.layout: Allow configure --localstatedir to over-ride /var/www
  location in Fedora layout.

* Makefile.in (install-suexec*): Fix make -jN install.

Submitted by: Arkadiusz Miskiewicz <arekm maven.pl>

Submitted by: jorton
Reviewed by: jorton, covener, jim

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

6 years agopromote
Jim Jagielski [Wed, 8 Aug 2018 11:46:52 +0000 (11:46 +0000)] 
promote

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

6 years agovote on some backports
Jim Jagielski [Wed, 8 Aug 2018 11:46:19 +0000 (11:46 +0000)] 
vote on some backports

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

6 years agoPropose a few monitoring improvements.
Rainer Jung [Tue, 7 Aug 2018 14:19:31 +0000 (14:19 +0000)] 
Propose a few monitoring improvements.

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

6 years agovote/comment
Eric Covener [Sun, 5 Aug 2018 14:15:25 +0000 (14:15 +0000)] 
vote/comment

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

6 years agoFix comment in mod_lua and docs.
Christophe Jaillet [Sat, 4 Aug 2018 08:09:54 +0000 (08:09 +0000)] 
Fix comment in mod_lua and docs.

s/addoutputfilter/add_output_filter/
See PR 62359
(r1837404 on trunk)

Note: .c file is patch without any vote because it is only a comment in order to be consistent with the doc and the code, and mod_lua is marked as experimental.

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

6 years agoupdate backport prop
Jim Jagielski [Fri, 3 Aug 2018 13:17:28 +0000 (13:17 +0000)] 
update backport prop

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

6 years agoOn the 2.4.x branch:
Stefan Eissing [Fri, 3 Aug 2018 10:54:47 +0000 (10:54 +0000)] 
On the 2.4.x branch:

backport of r1837357 from trunk.
  *) mod_md: When the last domain name from an MD is moved to another one,
     that now empty MD gets moved to the store archive. PR 62572.

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

7 years agoPropose mod_socache_redis as backport
Jim Jagielski [Wed, 1 Aug 2018 12:54:54 +0000 (12:54 +0000)] 
Propose mod_socache_redis as backport

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

7 years agobackport proposal
Jim Jagielski [Wed, 1 Aug 2018 11:58:52 +0000 (11:58 +0000)] 
backport proposal

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

7 years agorebuilt added misc index.html.es ES
Luis Gil [Wed, 1 Aug 2018 01:15:48 +0000 (01:15 +0000)] 
rebuilt added misc index.html.es ES

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

7 years agorebuilt added ES
Luis Gil [Wed, 1 Aug 2018 00:56:32 +0000 (00:56 +0000)] 
rebuilt added ES

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

7 years agorebuilt added ES
Luis Gil [Wed, 1 Aug 2018 00:44:00 +0000 (00:44 +0000)] 
rebuilt added ES

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

7 years agorebuilt added ES
Luis Gil [Wed, 1 Aug 2018 00:29:33 +0000 (00:29 +0000)] 
rebuilt added ES

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

7 years agoforgot to commit html
Luis Gil [Wed, 1 Aug 2018 00:20:07 +0000 (00:20 +0000)] 
forgot to commit html

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

7 years agorebuilt spanish docs to match eng rev of ssi
Luis Gil [Wed, 1 Aug 2018 00:17:49 +0000 (00:17 +0000)] 
rebuilt spanish docs to match eng rev of ssi
translated adding ssi spanish doc

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

7 years agobuilt and update file http2.html.es
Luis Gil [Wed, 1 Aug 2018 00:08:43 +0000 (00:08 +0000)] 
built and update file http2.html.es

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

7 years agorebuilt
Luis Gil [Wed, 1 Aug 2018 00:01:15 +0000 (00:01 +0000)] 
rebuilt

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

7 years agorebuilt spanish docs access.html.es
Luis Gil [Wed, 1 Aug 2018 00:00:43 +0000 (00:00 +0000)] 
rebuilt spanish docs access.html.es

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

7 years agorebuilt
Luis Gil [Tue, 31 Jul 2018 23:38:04 +0000 (23:38 +0000)] 
rebuilt

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

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837195 13f79...
Luis Gil [Tue, 31 Jul 2018 23:23:20 +0000 (23:23 +0000)] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837195 13f79535-47bb-0310-9956-ffa450edef68

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837193 13f79...
Luis Gil [Tue, 31 Jul 2018 22:41:14 +0000 (22:41 +0000)] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837193 13f79535-47bb-0310-9956-ffa450edef68

7 years agofixed miss spells and rebuilt
Luis Gil [Tue, 31 Jul 2018 22:39:29 +0000 (22:39 +0000)] 
fixed miss spells and rebuilt

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

7 years agorebuilt
Luis Gil [Tue, 31 Jul 2018 22:38:15 +0000 (22:38 +0000)] 
rebuilt

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

7 years agofixed miss spells and rebuilt
Luis Gil [Tue, 31 Jul 2018 22:03:00 +0000 (22:03 +0000)] 
fixed miss spells and rebuilt

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

7 years agospelling
Christophe Jaillet [Tue, 31 Jul 2018 21:59:31 +0000 (21:59 +0000)] 
spelling

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

7 years agofixed miss spells and rebuilt
Luis Gil [Tue, 31 Jul 2018 21:58:33 +0000 (21:58 +0000)] 
fixed miss spells and rebuilt

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

7 years agomached ENG rev 1824187
Luis Gil [Tue, 31 Jul 2018 21:37:28 +0000 (21:37 +0000)] 
mached ENG rev 1824187

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

7 years agoupdated spanish revision to match English Revision: 1807765 index file
Luis Gil [Tue, 31 Jul 2018 21:29:11 +0000 (21:29 +0000)] 
updated spanish revision to match English Revision: 1807765 index file

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

7 years agoRebuild.
Lucien Gentis [Tue, 31 Jul 2018 16:22:29 +0000 (16:22 +0000)] 
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Tue, 31 Jul 2018 16:21:26 +0000 (16:21 +0000)] 
XML update.

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

7 years agoRebuild.
Lucien Gentis [Tue, 31 Jul 2018 16:12:49 +0000 (16:12 +0000)] 
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Tue, 31 Jul 2018 16:11:48 +0000 (16:11 +0000)] 
XML updates.

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

7 years agoxform
Eric Covener [Thu, 26 Jul 2018 19:51:52 +0000 (19:51 +0000)] 
xform

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

7 years agoMerge r1836758 from trunk:
Eric Covener [Thu, 26 Jul 2018 19:50:41 +0000 (19:50 +0000)] 
Merge r1836758 from trunk:

replace mystery smart-quotes copy/pasted from httpd.conf + vi.

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

7 years agoMerge r1836638 from trunk:
Eric Covener [Wed, 25 Jul 2018 14:47:11 +0000 (14:47 +0000)] 
Merge r1836638 from trunk:

add 2 conditional logging examples

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

7 years agoPropose 2x buildsystem tweaks.
Joe Orton [Mon, 23 Jul 2018 09:04:08 +0000 (09:04 +0000)] 
Propose 2x buildsystem tweaks.

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

7 years agoMerged x2.
Joe Orton [Mon, 23 Jul 2018 08:54:55 +0000 (08:54 +0000)] 
Merged x2.

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

7 years agoMerge r1555631 from trunk:
Joe Orton [Mon, 23 Jul 2018 08:54:29 +0000 (08:54 +0000)] 
Merge r1555631 from trunk:

Fix config merging of SSLOCSPEnable and SSLOCSPOverrideResponder.

Submitted by: trawick, Frank Meier <frank.meier ergon.ch>
Reviewed by: rpluem, ylavic, jorton

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