]> granicus.if.org Git - apache/log
apache
7 years agoRebuild.
Lucien Gentis [Sun, 7 May 2017 15:49:48 +0000 (15:49 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794215 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sun, 7 May 2017 15:48:50 +0000 (15:48 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794214 13f79535-47bb-0310-9956-ffa450edef68

7 years agoupdate transformation
André Malo [Sat, 6 May 2017 17:06:28 +0000 (17:06 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794163 13f79535-47bb-0310-9956-ffa450edef68

7 years agoproperty fixes
André Malo [Sat, 6 May 2017 16:56:09 +0000 (16:56 +0000)]
property fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794161 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 6 May 2017 16:42:59 +0000 (16:42 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794160 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 6 May 2017 16:41:21 +0000 (16:41 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794159 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_remoteip doc rebuild
Luca Toscano [Sat, 6 May 2017 14:07:45 +0000 (14:07 +0000)]
mod_remoteip doc rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794143 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRemove unclear sentence in mod_remoteip doc
Luca Toscano [Sat, 6 May 2017 14:07:08 +0000 (14:07 +0000)]
Remove unclear sentence in mod_remoteip doc

This sentence has been discussed in the docs@
mailing list since it wasn't super clear for
some people. I propose to just remove it,
the rest of the content is already clear in
my opinion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794142 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 5 May 2017 13:24:50 +0000 (13:24 +0000)]
On the trunk:

update after mod_http2 backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794053 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 5 May 2017 13:03:41 +0000 (13:03 +0000)]
On the trunk:

mod_http2: fail requests without ERROR log in case we need to read interim
     responses and see only garbage. This can happen if proxied servers send
     data where none should be, e.g. a body for a HEAD request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794049 13f79535-47bb-0310-9956-ffa450edef68

7 years agoDocumentation rebuild
Luca Toscano [Fri, 5 May 2017 12:53:05 +0000 (12:53 +0000)]
Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794046 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd a note about time resolution to the timeout parameters - PR61067
Luca Toscano [Fri, 5 May 2017 12:52:00 +0000 (12:52 +0000)]
Add a note about time resolution to the timeout parameters - PR61067

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1794044 13f79535-47bb-0310-9956-ffa450edef68

7 years agodocs: update
Jacob Champion [Thu, 4 May 2017 23:49:54 +0000 (23:49 +0000)]
docs: update

(Why wasn't mod_ssl.html.en updated during my last build...?)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793939 13f79535-47bb-0310-9956-ffa450edef68

7 years agooverride index: update missing <override>s in directives
Jacob Champion [Thu, 4 May 2017 23:41:19 +0000 (23:41 +0000)]
override index: update missing <override>s in directives

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793934 13f79535-47bb-0310-9956-ffa450edef68

7 years agooverride index: remove invalid <override>s from directives
Jacob Champion [Thu, 4 May 2017 23:41:16 +0000 (23:41 +0000)]
override index: remove invalid <override>s from directives

Remove the bogus "none" and "n/a" type <override>s from the
documentation. If a directive can't be put in .htaccess, it shouldn't
have an <override> element.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793933 13f79535-47bb-0310-9956-ffa450edef68

7 years agomerge in the override index
Jacob Champion [Thu, 4 May 2017 23:36:59 +0000 (23:36 +0000)]
merge in the override index

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793932 13f79535-47bb-0310-9956-ffa450edef68

7 years agodocs: update
Jacob Champion [Thu, 4 May 2017 23:32:41 +0000 (23:32 +0000)]
docs: update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793931 13f79535-47bb-0310-9956-ffa450edef68

7 years agooverride index: clarify this doc's purpose trunk-override-index trunk-override-index
Jacob Champion [Thu, 4 May 2017 22:54:00 +0000 (22:54 +0000)]
override index: clarify this doc's purpose

Based on feedback by elukey.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793923 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd an Override Class Index
Jacob Champion [Thu, 4 May 2017 22:53:58 +0000 (22:53 +0000)]
Add an Override Class Index

This page pulls in directives that declare an <override> element and
groups them by class. The documentation for each class comes from
overrides.xml. Any undocumented classes are flagged with a boilerplate
fallback text (this situation is only likely to occur with a misspelling
or otherwise invalid <override> somewhere else in the documentation).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793922 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFeature branch for a new override index manual page.
Jacob Champion [Thu, 4 May 2017 22:50:47 +0000 (22:50 +0000)]
Feature branch for a new override index manual page.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-override-index@1793921 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 2 May 2017 15:30:07 +0000 (15:30 +0000)]
On the trunk:

mod_proxy_http2: update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793533 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 2 May 2017 15:16:43 +0000 (15:16 +0000)]
On the trunk:

mod_proxy_http2: adding support for Reverse Proxy Request headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793525 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRemove a space to synch with 2.4.x.
Christophe Jaillet [Mon, 1 May 2017 11:58:37 +0000 (11:58 +0000)]
Remove a space to synch with 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793314 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSynch with 2.4.x.
Christophe Jaillet [Mon, 1 May 2017 08:17:16 +0000 (08:17 +0000)]
Synch with 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793291 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSynch with trunk.
Christophe Jaillet [Mon, 1 May 2017 08:14:13 +0000 (08:14 +0000)]
Synch with trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793290 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSynch trunk and 2.4 branch (r1735954 in 2.4)
Christophe Jaillet [Mon, 1 May 2017 07:53:50 +0000 (07:53 +0000)]
Synch trunk and 2.4 branch (r1735954 in 2.4)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793288 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSynch trunk and 2.4 branch
Christophe Jaillet [Mon, 1 May 2017 07:44:55 +0000 (07:44 +0000)]
Synch trunk and 2.4 branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793287 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix NULL pointer dereference in error logging message
Christophe Jaillet [Mon, 1 May 2017 07:36:56 +0000 (07:36 +0000)]
Fix NULL pointer dereference in error logging message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793286 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 29 Apr 2017 14:04:39 +0000 (14:04 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793199 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 29 Apr 2017 14:03:52 +0000 (14:03 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793198 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix typo
Christophe Jaillet [Fri, 28 Apr 2017 04:43:21 +0000 (04:43 +0000)]
Fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792983 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFollow up to r1789220.
Yann Ylavic [Tue, 25 Apr 2017 22:53:11 +0000 (22:53 +0000)]
Follow up to r1789220.
Document the implicit behaviour of ListenCoresBucketsRatio when multiple
Listen-ers are configured on the same IP:port.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792675 13f79535-47bb-0310-9956-ffa450edef68

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792661 13f79535-47bb...
Luis Gil [Tue, 25 Apr 2017 21:29:09 +0000 (21:29 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792661 13f79535-47bb-0310-9956-ffa450edef68

7 years agoadded mod rewrite section to the page
Luis Gil [Tue, 25 Apr 2017 21:28:58 +0000 (21:28 +0000)]
added mod rewrite section to the page

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792660 13f79535-47bb-0310-9956-ffa450edef68

7 years agoEvaluate nested If/ElseIf/Else config sections
Luca Toscano [Tue, 25 Apr 2017 09:06:26 +0000 (09:06 +0000)]
Evaluate nested If/ElseIf/Else config sections

It has been reported multiple times that nested
If/ElseIf/Else sections are not evaluated but
silently ignored.

This patch adds a simple recursion to the ap_if_walk
logic in order to allow arbitrary nested configs.
The overhead seems negligible compared to the actual
version of the ap_if_walk, but more expert feedback
is surely needed since this code gets called for every
HTTP request.

Tests are going to be added to t/apache/if_sections.t

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792589 13f79535-47bb-0310-9956-ffa450edef68

7 years agodespite trace, assign a APLOGNO, as done elsewhere in this mod
Eric Covener [Sun, 23 Apr 2017 21:27:15 +0000 (21:27 +0000)]
despite trace, assign a APLOGNO, as done elsewhere in this mod

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792395 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPR61012: log a trace message on tunnel shutdown
Eric Covener [Sun, 23 Apr 2017 21:26:37 +0000 (21:26 +0000)]
PR61012: log a trace message on tunnel shutdown

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792394 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix some compatibility notes
Christophe Jaillet [Sun, 23 Apr 2017 03:29:41 +0000 (03:29 +0000)]
Fix some compatibility notes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792336 13f79535-47bb-0310-9956-ffa450edef68

7 years agoSynch trunk doc with 2.4.x (add some " in order to improve syntax highlight)
Christophe Jaillet [Sun, 23 Apr 2017 03:19:46 +0000 (03:19 +0000)]
Synch trunk doc with 2.4.x (add some " in order to improve syntax highlight)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792335 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 22 Apr 2017 15:52:31 +0000 (15:52 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792297 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 22 Apr 2017 15:51:46 +0000 (15:51 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792296 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix pattern (.xml source filenames aren't charset tagged)
William A. Rowe Jr [Fri, 21 Apr 2017 14:46:30 +0000 (14:46 +0000)]
Fix pattern (.xml source filenames aren't charset tagged)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792216 13f79535-47bb-0310-9956-ffa450edef68

7 years agoStill can find only one problem case alluded to by André.
William A. Rowe Jr [Fri, 21 Apr 2017 14:42:29 +0000 (14:42 +0000)]
Still can find only one problem case alluded to by André.

Where Accept-Lanuage is da Q=1 and ru Q=1, leaving these out of the priority
list results in English as the tie-breaker, which is incorrect.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792214 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 21 Apr 2017 14:09:25 +0000 (14:09 +0000)]
On the trunk:

mod_http2: update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792212 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 21 Apr 2017 12:21:31 +0000 (12:21 +0000)]
On the trunk:

mod_http2: fixed possible deadlock that could occur when connections were
     terminated early with ongoing streams. Fixed possible hanger with timeout
     on race when connection considers itself idle.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792195 13f79535-47bb-0310-9956-ffa450edef68

7 years agoIntroduce request taint-checking concept.
Nick Kew [Fri, 21 Apr 2017 08:44:06 +0000 (08:44 +0000)]
Introduce request taint-checking concept.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792169 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd missing documentation for secret.
Jean-Frederic Clere [Fri, 21 Apr 2017 07:06:40 +0000 (07:06 +0000)]
Add missing documentation for secret.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792168 13f79535-47bb-0310-9956-ffa450edef68

7 years agoAdd upgrade parameter to mod_proxy_wstunnel.
Jean-Frederic Clere [Thu, 20 Apr 2017 17:07:32 +0000 (17:07 +0000)]
Add upgrade parameter to mod_proxy_wstunnel.
That allows to upgrade to jboss-remoting for example
or to run an HTTP/1.1 backend that needs to upgrade to
WebSocket.
See also:
 https://issues.jboss.org/browse/JBCS-254
 https://issues.jboss.org/browse/JBCS-291

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1792092 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPR61009: be as helpful as possible during -V operation
Jacob Champion [Wed, 19 Apr 2017 20:38:26 +0000 (20:38 +0000)]
PR61009: be as helpful as possible during -V operation

A configtest isn't useful if you're just trying to get compile settings.
Move the settings dump up to just after ap_read_config(), which has
already done the minimum necessary to figure out which MPM is in use.

Even if ap_read_config() failed, still print as many compile settings as
we can. The user will see the error log entry on stderr.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791975 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge fix branch for PR60947.
Jacob Champion [Wed, 19 Apr 2017 02:42:43 +0000 (02:42 +0000)]
Merge fix branch for PR60947.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791849 13f79535-47bb-0310-9956-ffa450edef68

7 years agossl_util.c: add APLOGNOs trunk-openssl-threadid trunk-openssl-threadid
Jacob Champion [Wed, 19 Apr 2017 02:38:20 +0000 (02:38 +0000)]
ssl_util.c: add APLOGNOs

Start from 10027 to match the current trunk (r1791845), which will be
merged into shortly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791848 13f79535-47bb-0310-9956-ffa450edef68

7 years agossl_util.c: log which threadid callback is in use
Jacob Champion [Wed, 19 Apr 2017 02:23:48 +0000 (02:23 +0000)]
ssl_util.c: log which threadid callback is in use

This should help during testing and debugging. Use APLOG_NOTICE for now,
until we fix PR60999, so that people can actually see the log message.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791847 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_ssl_ct: fix return values for custom extension callback
Jacob Champion [Wed, 19 Apr 2017 01:32:58 +0000 (01:32 +0000)]
mod_ssl_ct: fix return values for custom extension callback

This is most likely a follow-up to r1628833.

At some point during the OpenSSL 1.0.2 beta, the contract for custom
extension callbacks changed from "returning -1 skips the extension" to
"returning -1 will issue a TLS fatal alert". This caused mod_ssl_ct to
abort TLS connections that it intended to ignore. Zero is the correct
return value for "do nothing" in 1.0.2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791845 13f79535-47bb-0310-9956-ffa450edef68

7 years agoKISS: RemoveType is a simpler fix for .tr; explain .da files; order our
William A. Rowe Jr [Tue, 18 Apr 2017 16:25:03 +0000 (16:25 +0000)]
KISS: RemoveType is a simpler fix for .tr; explain .da files; order our
LanguagePriority by a first-order comparison and drop negligable translations
from our ordered priority preference list entirely.

A better comparison would be total number of documents in-sync, or some
convoluted weight ordering each document by which are more in sync than
others. Leaving that puzzle to an interested hacker.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791807 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 18 Apr 2017 14:44:19 +0000 (14:44 +0000)]
On the trunk:

update after mod_http2 backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791790 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 18 Apr 2017 12:15:12 +0000 (12:15 +0000)]
On the trunk:

mod_http2: normalize zombie slot state before pushing it on the free list.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791773 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPR60947: try to warn affected users...
Jacob Champion [Tue, 18 Apr 2017 00:19:34 +0000 (00:19 +0000)]
PR60947: try to warn affected users...

...but at the moment, this won't actually get logged unless you're
running in debug mode, due to an unrelated bug (PR60999).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791733 13f79535-47bb-0310-9956-ffa450edef68

7 years agoPR60947: avoid CRYPTO_THREADID_set_callback() if possible
Jacob Champion [Tue, 18 Apr 2017 00:19:32 +0000 (00:19 +0000)]
PR60947: avoid CRYPTO_THREADID_set_callback() if possible

CRYPTO_THREADID_set_callback() is write-once, so if mod_ssl is unloaded
and reloaded into a different address, we'll crash if OpenSSL wasn't
also unloaded and reloaded at the same time. This can happen if another
module or library is using OpenSSL as well.

- OpenSSL 1.1.0 isn't affected.
- Certain platforms (Windows, BeOS, and POSIX-compliant systems) can
  make use of the default THREADID callback in OpenSSL 1.0.x.
- If the deprecated CRYPTO_set_id_callback() is available, we can use it
  instead of CRYPTO_THREADID_set_callback().

Otherwise, we have to fall back to CRYPTO_THREADID_set_callback(), but
hopefully that applies to a small percentage of users at this point.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791732 13f79535-47bb-0310-9956-ffa450edef68

7 years agossl_util.c: add a couple explanatory comments
Jacob Champion [Tue, 18 Apr 2017 00:19:30 +0000 (00:19 +0000)]
ssl_util.c: add a couple explanatory comments

Mark the things that are busted.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791731 13f79535-47bb-0310-9956-ffa450edef68

7 years agossl_util.c: pull up duplicated code in ssl_util_thr_id()
Jacob Champion [Tue, 18 Apr 2017 00:19:27 +0000 (00:19 +0000)]
ssl_util.c: pull up duplicated code in ssl_util_thr_id()

Should make it easier to see what's going on in the next few changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791730 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 17 Apr 2017 09:17:55 +0000 (09:17 +0000)]
On the trunk:

mod_http2: MaxKeepAliveRequests now limits the number of times a
     slave connection gets reused.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791669 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_substitute: use local/native LF for splitting
Eric Covener [Fri, 14 Apr 2017 19:38:34 +0000 (19:38 +0000)]
mod_substitute: use local/native LF for splitting

On platforms where the APR_ASCII_LF != '\n', like EBCDIC systems,
strmatch or pcre patterns from the source or config will be in
the native encoding, and this module will really only work on
content in the native encoding.

(mod_substitute runs before mod_charset_lite for a similar reason)

I thought #if APR_CHARSET_EBCDIC or even #ifdef __MVS__ was overkill
here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791400 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 14 Apr 2017 16:02:22 +0000 (16:02 +0000)]
On the trunk:

mod_http2: client streams that lack the EOF flag get now forcefully
     closed with a RST_STREAM (NO_ERROR) when the request has been answered.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791388 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Fri, 14 Apr 2017 15:08:32 +0000 (15:08 +0000)]
On the trunk:

mod_http2: only when 'HttpProtocolOptions Unsafe' is configured, will
     control characters in response headers or trailers be forwarded to the
     client. Otherwise, in the default configuration, a request will eiher
     fail with status 500 or the stream will be reset by a RST_STREAM frame.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791377 13f79535-47bb-0310-9956-ffa450edef68

7 years agoconfigure: bump thread count for the &errno test
Jacob Champion [Fri, 14 Apr 2017 00:14:24 +0000 (00:14 +0000)]
configure: bump thread count for the &errno test

Increase the number of threads from three to ten. Patch by rjung.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791309 13f79535-47bb-0310-9956-ffa450edef68

7 years agoxforms
Jim Jagielski [Thu, 13 Apr 2017 12:27:56 +0000 (12:27 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791238 13f79535-47bb-0310-9956-ffa450edef68

7 years agolocation of brotli lib
Jim Jagielski [Thu, 13 Apr 2017 12:20:15 +0000 (12:20 +0000)]
location of brotli lib

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791234 13f79535-47bb-0310-9956-ffa450edef68

7 years agoMerge the AP_OPENSSL_USE_ERRNO_THREADID check to trunk for wider testing
Jacob Champion [Wed, 12 Apr 2017 00:07:35 +0000 (00:07 +0000)]
Merge the AP_OPENSSL_USE_ERRNO_THREADID check to trunk for wider testing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791055 13f79535-47bb-0310-9956-ffa450edef68

7 years agoconfigure: check if &errno is thread-local for OpenSSL
Jacob Champion [Tue, 11 Apr 2017 23:59:31 +0000 (23:59 +0000)]
configure: check if &errno is thread-local for OpenSSL

This is step one for fixing, or at least mitigating, PR60947. Determine
which platforms can use the default OpenSSL (1.0.x) threadid-callback,
by recording the address of errno for several threads and testing that
they're all different.

The result of this test is put into the new macro,
AP_OPENSSL_USE_ERRNO_THREADID.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791054 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFeature branch for PR60947.
Jacob Champion [Tue, 11 Apr 2017 23:47:33 +0000 (23:47 +0000)]
Feature branch for PR60947.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791053 13f79535-47bb-0310-9956-ffa450edef68

7 years agoIf the lingering close does not leave the socket in a disconnected state,
William A. Rowe Jr [Tue, 11 Apr 2017 14:09:00 +0000 (14:09 +0000)]
If the lingering close does not leave the socket in a disconnected state,
do not recycle the socket.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790978 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 11 Apr 2017 13:41:44 +0000 (13:41 +0000)]
On the trunk:

mpm_winnt: always invoke ap_lingering_close() at connection end.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790973 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Fix leftovers from mod_deflate or incorrect directives in
Evgeny Kotkov [Mon, 10 Apr 2017 16:08:42 +0000 (16:08 +0000)]
mod_brotli: Fix leftovers from mod_deflate or incorrect directives in
the "Serving pre-compressed content" section of the docs.

Generally speaking, this section would benefit from a rewrite pointing
out how to configure a mod_deflate + mod_brotli configuration with
precompressed contents, but for now at least fix the mistakes in the
configuration.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790871 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Tweak the descriptions of the directives provided by mod_brotli
Evgeny Kotkov [Mon, 10 Apr 2017 16:04:19 +0000 (16:04 +0000)]
mod_brotli: Tweak the descriptions of the directives provided by mod_brotli
in the documentation (BrotliCompressionQuality, BrotliCompressionWindow,
BrotliCompressionMaxInputBlock, BrotliAlterETag).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790870 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Nuke the section about input decompression using mod_brotli
Evgeny Kotkov [Mon, 10 Apr 2017 16:02:04 +0000 (16:02 +0000)]
mod_brotli: Nuke the section about input decompression using mod_brotli
in the documentation.

Currently, mod_brotli only allows dynamic output compression, and doesn't
have the server-side decompression capability.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790869 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Properly describe the "no-brotli" environment variable in
Evgeny Kotkov [Mon, 10 Apr 2017 15:59:56 +0000 (15:59 +0000)]
mod_brotli: Properly describe the "no-brotli" environment variable in
the documentation.

The previous description explained the semantics of this variable as
if it has been a (non-existing) "force-brotli".

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790868 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Remove incorrect references to mod_deflate in the documentation.
Evgeny Kotkov [Mon, 10 Apr 2017 15:57:06 +0000 (15:57 +0000)]
mod_brotli: Remove incorrect references to mod_deflate in the documentation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790866 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK.
Evgeny Kotkov [Mon, 10 Apr 2017 15:27:58 +0000 (15:27 +0000)]
mod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790860 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 10 Apr 2017 15:23:34 +0000 (15:23 +0000)]
On the trunk:

mod_http2: explicit int conversions to silence warnings in mod-h2 build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790855 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Fix a minor typo in the description of BrotliAlterETag
Evgeny Kotkov [Mon, 10 Apr 2017 15:19:19 +0000 (15:19 +0000)]
mod_brotli: Fix a minor typo in the description of BrotliAlterETag
that has been referring to httpd 2.2.x.

There's no mod_brotli in 2.2.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790853 13f79535-47bb-0310-9956-ffa450edef68

7 years agomod_brotli: Update makefile to allow using Brotli library >= 0.6.0.
Evgeny Kotkov [Mon, 10 Apr 2017 15:17:07 +0000 (15:17 +0000)]
mod_brotli: Update makefile to allow using Brotli library >= 0.6.0.

The 0.6.0 version has just been released [1], and it contains the
necessary API required for mod_brotli.

[1] https://github.com/google/brotli/releases/tag/v0.6.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790852 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 10 Apr 2017 15:14:22 +0000 (15:14 +0000)]
On the trunk:

update after mod_http2 backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790850 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 10 Apr 2017 14:51:02 +0000 (14:51 +0000)]
On the trunk:

mod_proxy_http2: no longer mapping link headers when preserve host is on.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790842 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 10 Apr 2017 13:23:03 +0000 (13:23 +0000)]
On the trunk:

mod_proxy_http2: 1 is true.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790827 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Mon, 10 Apr 2017 13:21:43 +0000 (13:21 +0000)]
On the trunk:

mod_proxy_http2: Reliability of reconnect handling improved.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790826 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the turnk:
Stefan Eissing [Sun, 9 Apr 2017 16:42:36 +0000 (16:42 +0000)]
On the turnk:

mod_http2: fixed two deadlocks introduced by removing nested mplx locking earlier.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790754 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 8 Apr 2017 16:07:52 +0000 (16:07 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790694 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML update.
Lucien Gentis [Sat, 8 Apr 2017 16:07:13 +0000 (16:07 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790693 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 8 Apr 2017 15:59:57 +0000 (15:59 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790692 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML update plus typo in mod_remoteip.xml.
Lucien Gentis [Sat, 8 Apr 2017 15:55:52 +0000 (15:55 +0000)]
XML update plus typo in mod_remoteip.xml.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790691 13f79535-47bb-0310-9956-ffa450edef68

7 years agoh2_worker.c is no more, so remove reference to this file.
Christophe Jaillet [Fri, 7 Apr 2017 20:05:29 +0000 (20:05 +0000)]
h2_worker.c is no more, so remove reference to this file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790620 13f79535-47bb-0310-9956-ffa450edef68

7 years agoFix directive name in
Christophe Jaillet [Thu, 6 Apr 2017 20:38:01 +0000 (20:38 +0000)]
Fix directive name in
(s/RemoteIPProxyProtocolDisableNetworks/RemoteIPProxyProtocolExceptions/)

Use cmd->cmd->name instead to be future proof.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790457 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Wed, 5 Apr 2017 14:49:25 +0000 (14:49 +0000)]
On the trunk:

mod_http2: less and more granular mutex use for improved performance.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790284 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRename RemoteIPProxyProtocolDisableHosts to RemoteIPProxyProtocolExceptions
Daniel Ruggeri [Wed, 5 Apr 2017 01:11:36 +0000 (01:11 +0000)]
Rename RemoteIPProxyProtocolDisableHosts to RemoteIPProxyProtocolExceptions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790169 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 4 Apr 2017 13:45:09 +0000 (13:45 +0000)]
On the trunk:

mod_http2: code cleanup after eliminating nested locks, giving worker slots their own mutex.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790113 13f79535-47bb-0310-9956-ffa450edef68

7 years agoOn the trunk:
Stefan Eissing [Tue, 4 Apr 2017 12:39:22 +0000 (12:39 +0000)]
On the trunk:

mod_http2/mod_proxy_http2: less read attempts on bucket beams that already
     delivered EOS/headers. Fixed bug in re-attempting proxy request after
     connection error.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1790102 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 1 Apr 2017 16:24:16 +0000 (16:24 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789815 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML update.
Lucien Gentis [Sat, 1 Apr 2017 16:23:39 +0000 (16:23 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789814 13f79535-47bb-0310-9956-ffa450edef68

7 years agoRebuild.
Lucien Gentis [Sat, 1 Apr 2017 16:18:41 +0000 (16:18 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789813 13f79535-47bb-0310-9956-ffa450edef68

7 years agoXML updates.
Lucien Gentis [Sat, 1 Apr 2017 16:17:38 +0000 (16:17 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1789811 13f79535-47bb-0310-9956-ffa450edef68