]>
granicus.if.org Git - apache/log
Eric Covener [Mon, 5 Jun 2017 13:13:21 +0000 (13:13 +0000)]
whitespace and match 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1797662 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 13:12:25 +0000 (13:12 +0000)]
a few more backported fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1797661 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Jun 2017 13:11:11 +0000 (13:11 +0000)]
remove some backported items
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1797660 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 3 Jun 2017 22:04:47 +0000 (22:04 +0000)]
mod_mime: fix quoted pair scanning
Submitted By: ylavic
CVEID: CVE-2017-7679
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1797550 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 30 May 2017 13:39:45 +0000 (13:39 +0000)]
whitespace only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796864 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Mon, 29 May 2017 22:08:22 +0000 (22:08 +0000)]
New Spanish translations for mod_actions.xml.es and related files referencing or related to it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796708 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Mon, 29 May 2017 08:49:11 +0000 (08:49 +0000)]
Added missing html Spanish translation for mod_access_compat.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796596 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:10:09 +0000 (14:10 +0000)]
ab: move option processing for setting a custom
HTTP method outside of the HTTPS only handling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796493 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Sat, 27 May 2017 21:24:29 +0000 (21:24 +0000)]
Added missing changes for Spanish references to security_tips.html.es in files, missing from commit r1795361
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796460 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Sat, 27 May 2017 21:18:41 +0000 (21:18 +0000)]
Added new Spanish translation for mod_acccess_compat, as well as the update for files referencing it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796457 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:21:29 +0000 (20:21 +0000)]
these are backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796451 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:16:30 +0000 (20:16 +0000)]
ctr'ed in
1796447 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796448 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:13:49 +0000 (20:13 +0000)]
PR61124: ap_parse_form_data() EBCDIC fix
URL-decoding doesn't work on EBCDIC.
Submitted By: Hank Ibell <hwibell gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796446 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 May 2017 13:03:01 +0000 (13:03 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796391 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 May 2017 13:02:09 +0000 (13:02 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796390 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 27 May 2017 10:52:22 +0000 (10:52 +0000)]
Move a potential NULL pointer dereference.
Check if 'slave' is NULL before using 'slave->keepalives'.
Remove a redundant assignment which is already done in 'h2_slave_destroy'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796378 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:50:33 +0000 (21:50 +0000)]
remove r1792169 taint checks from proxy and status modules
Both of these checks are problematic without further
work.
status: even a .htaccess with no SetHandler blocks the handler.
proxy: RewriteRule ... ... [P] in htaccess is blocked.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796352 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:40:11 +0000 (21:40 +0000)]
short-circuit on NULL
Submitted By: jchampion
CVEID: CVE-2017-7668
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796350 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:29:59 +0000 (21:29 +0000)]
core: deprecate and replace ap_get_basic_auth_pw
*) core: Deprecate ap_get_basic_auth_pw() and add
ap_get_basic_auth_components().
Submitted By: Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener
CVEID: CVE-2017-3167
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796348 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:09:32 +0000 (21:09 +0000)]
mod_ssl: fix ctx passed to ssl_io_filter_error()
Consistently pass the expected bio_filter_in_ctx_t
to ssl_io_filter_error().
Submitted By: Yann Ylavic
CVEID: CVE-2017-3169
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796343 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 May 2017 16:16:52 +0000 (16:16 +0000)]
fix confusing indentation of examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796296 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 25 May 2017 08:44:55 +0000 (08:44 +0000)]
Core documentation update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796136 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 25 May 2017 08:44:09 +0000 (08:44 +0000)]
Remove warning about nested If/ElseIf/Else evaluation
As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1796135 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 23 May 2017 16:28:46 +0000 (16:28 +0000)]
Merge in APR[-util] macros from branches/trunk-buildconf-noapr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795931 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 23 May 2017 16:19:33 +0000 (16:19 +0000)]
buildconf: check in APR[-util] m4 macros
Suggestion by wrowe. These files haven't changed in years; since we need
them anyway, check them in directly. buildconf will still copy over the
latest versions during setup, and SVN will tell us if there are any
changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@
1795928 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 22 May 2017 17:54:59 +0000 (17:54 +0000)]
Remove empty line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795834 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 22 May 2017 16:40:54 +0000 (16:40 +0000)]
ab: don't call malloc_init for OpenSSL 1.1.0
Patch by rjung.
The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.
Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795830 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 May 2017 05:11:44 +0000 (05:11 +0000)]
Fix some style issues.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795652 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 May 2017 05:08:06 +0000 (05:08 +0000)]
Add an explicit NULL to initialise a field in an authn_provider structure, as done in all other places. PR 60636
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795651 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 19 May 2017 20:51:51 +0000 (20:51 +0000)]
When processing a 'SetEnv' directive, warn if the environment variable name includes a '='. It is likely a configuration error. PR 60249
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795635 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Tue, 16 May 2017 19:43:42 +0000 (19:43 +0000)]
Added security_tips.xml.es and related files, included built html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795361 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 16 May 2017 19:33:36 +0000 (19:33 +0000)]
Remove 3DES by default for users of older crypto librarys; the cipher
has been reclassified in current OpenSSL releases as WEAK due to 112
or fewer bits of remaining cipher strength, while the Sweet32 disclosure
extended the criticism of RC4 on to 3DES. (IDEA, which potentially has the
same issue, is never enabled by default in OpenSSL, due to patent concerns.)
This commit does not change default httpd behavior, but alters the suggested
behavior of newly provisioned httpd servers. Where adopted, XP with IE8 will
no longer handshake with mod_ssl (previously, XP with IE6 would not handshake.)
The same net effect occurs where OpenSSL is updated to 1.1.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1795358 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 11 May 2017 17:10:05 +0000 (17:10 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1794857 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 11 May 2017 16:46:49 +0000 (16:46 +0000)]
remove recently backported items
(present in 2.4.x CHANGES)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1794853 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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