]>
granicus.if.org Git - apache/log
Stefan Eissing [Wed, 20 Jul 2016 15:57:51 +0000 (15:57 +0000)]
mod_http2: fixing config lookup now that we have dir conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753541 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 20 Jul 2016 13:07:15 +0000 (13:07 +0000)]
html update after new http2 directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753500 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 20 Jul 2016 13:04:57 +0000 (13:04 +0000)]
mod_http2: new H2CopyFiles directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753498 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 18 Jul 2016 20:43:09 +0000 (20:43 +0000)]
configure: remove orphaned APACHE_OUTPUT macro
The last use of APACHE_OUTPUT appears to have been removed back in
r87231.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753316 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 18 Jul 2016 20:43:08 +0000 (20:43 +0000)]
configure: move away from obsolete AC_OUTPUT args
AC_OUTPUT's use with arguments was obsoleted back at or before autoconf
2.50. Replace it with the preferred AC_CONFIG_FILES/AC_CONFIG_COMMANDS
calls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753315 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 16:20:27 +0000 (16:20 +0000)]
A whole lotta nope, if you implement HTCPCP then register your methods in init
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753263 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 16:01:21 +0000 (16:01 +0000)]
Restore 'HEAD' method as a special case of GET with the common ID
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753257 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 15:31:39 +0000 (15:31 +0000)]
The method_registry is initialized in register_hooks() for mod_http
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753245 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 14:09:38 +0000 (14:09 +0000)]
Optimization to httpoxy workaround, for 2.4.23+ only.
Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753229 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 14:07:00 +0000 (14:07 +0000)]
httpoxy workarounds, first draft patch as published for all 2.2.x+ sources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753228 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 13:43:08 +0000 (13:43 +0000)]
Unclear whether fdpass is common enough to justify a 'most' configuration,
but for the time being, assign it -something- for a build priority.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753224 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Jul 2016 13:41:26 +0000 (13:41 +0000)]
Simplify; this code is executed one per request processed, saving
an immeasurably small quantum of CPU of a server under load.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753223 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 18 Jul 2016 08:02:23 +0000 (08:02 +0000)]
mod_proxy_fcgi: avoid loops serving proxied error documents
This commit should solve the issue indicated in PR 55415.
Httpd loops while serving a error document if:
1) The error document's content is proxied.
2) ProxyErrorOverride is set.
The solution proposed is to limit the use of ap_die only
to the initial request. I tested the change with very basic
scenarios but I am not sure if I got all the use cases,
feedback is really welcome.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1753167 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Jul 2016 16:01:47 +0000 (16:01 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752981 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Jul 2016 16:00:49 +0000 (16:00 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752980 13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Sat, 16 Jul 2016 00:00:43 +0000 (00:00 +0000)]
add comments for all media types in IANA registry dated 2016-07-14
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752884 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 15 Jul 2016 11:59:42 +0000 (11:59 +0000)]
Doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752825 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 15 Jul 2016 11:59:10 +0000 (11:59 +0000)]
Added a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads lower bounds calculation in the docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752824 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 14 Jul 2016 21:02:38 +0000 (21:02 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752748 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 14 Jul 2016 21:01:28 +0000 (21:01 +0000)]
Fix PR 59856.
Fix directive name. (ProxyRequest vs ProxyRequests)
Improve highlight.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752747 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 Jul 2016 12:40:25 +0000 (12:40 +0000)]
PR59844: stack-allocated ap_expr_info_t returned from mod_include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752415 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 13 Jul 2016 11:36:05 +0000 (11:36 +0000)]
Fix typo in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752398 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 12 Jul 2016 21:15:59 +0000 (21:15 +0000)]
Ensure the default mode and cipher is set correctly. Remove useless setting
of the size_set flag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752348 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 12 Jul 2016 21:13:37 +0000 (21:13 +0000)]
Force mod_proxy_fcgi to read the whole FCGI response
even when the content has not been modified (HTTP 304).
The problem is described in PR 59838. This patch should
avoid bogus reads causing the following issues with
HTTP 304 responses:
- AH01068: Got bogus version X, expected 1
- AH01069: Got bogus rid X, expected 1
- AH01075: Error dispatching request to :
- HTTP 503 logged instead of 304 (even if the external
client gets correctly a 304)
As discussed on IRC the HTTP_PRECONDITION_FAILED use case
should be handled like the HTTP_NOT_MODIFIED one but it will
be done in a separate commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752347 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 12 Jul 2016 19:13:38 +0000 (19:13 +0000)]
CMake: quote installation paths
Deal with installation paths with spaces in them (e.g. "C:\Program
Files") by quoting the arguments to perl and xcopy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752333 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 12 Jul 2016 19:13:36 +0000 (19:13 +0000)]
CMake: use generator expressions to find output files
Multi-configuration generators, like Visual Studio, use a different
output directory (Debug, Release, etc.) for each configuration. To find
the output files reliably, switch to using generator expressions instead
of hardcoding the file paths for PDBs, export files, etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752332 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 12 Jul 2016 19:13:34 +0000 (19:13 +0000)]
CMake: use CMAKE_REQUIRED_INCLUDES to find APR macros
When using CMake with Visual Studio on Windows, invoking the
CHECK_SYMBOL_EXISTS macro with the full paths to the include files seems
to always result in failure.
Instead, use the documented CMAKE_REQUIRED_INCLUDES variable to set the
include directory, and pass only the headers' base names to
CHECK_SYMBOL_EXISTS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752331 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 11 Jul 2016 11:03:24 +0000 (11:03 +0000)]
mod_http2: no master timeout while requests are ongoing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752145 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 10 Jul 2016 20:00:17 +0000 (20:00 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752105 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 10 Jul 2016 19:56:36 +0000 (19:56 +0000)]
fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752104 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 10 Jul 2016 17:27:03 +0000 (17:27 +0000)]
mod_crypto: Add the all purpose crypto filters with support for HLS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752099 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 10 Jul 2016 14:50:38 +0000 (14:50 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752096 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 10 Jul 2016 13:02:17 +0000 (13:02 +0000)]
mod_http2: fixing flush on SETTINGS frames without open streams
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752087 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Jul 2016 16:37:13 +0000 (16:37 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752020 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Jul 2016 16:36:28 +0000 (16:36 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1752019 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 8 Jul 2016 21:49:47 +0000 (21:49 +0000)]
PR59815: rewrite per-directory + fcgi broken in 2.4.23
remove the query string from r->filename before calculating environment
(SCRIPT_FILENAME) in mod_proxy_fcgi. Before PR59618, php-fpm would
see proxy:fcgi:// and do some of this same stripping.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751970 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 8 Jul 2016 16:00:10 +0000 (16:00 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751931 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 8 Jul 2016 15:59:58 +0000 (15:59 +0000)]
mention mod_cgid too
http://httpd.apache.org/docs/2.4/howto/cgi.html#comment_5623
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751930 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 4 Jul 2016 17:21:09 +0000 (17:21 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751353 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 4 Jul 2016 17:19:54 +0000 (17:19 +0000)]
Remove reference to long-dead website that once upon a time used this functionality.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751352 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 4 Jul 2016 17:19:08 +0000 (17:19 +0000)]
Give an example of converting a password file from one format to the
other.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751351 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Jul 2016 12:10:57 +0000 (12:10 +0000)]
Updated description of the change to reflect the last patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751147 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Jul 2016 09:51:50 +0000 (09:51 +0000)]
Updated credits after Yann's patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751139 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 3 Jul 2016 09:48:06 +0000 (09:48 +0000)]
Improve the FCGI/CGI Last-Modified header value handling.
Patch from Yann after a discussion on the dev@ mailing list.
ap_scan_script_header_err_core_ex is now using apr_date_parse_rfc
in order to recognize non-GMT datestr following RFC822/1123
and transforming them to GMT rather than replacing the value
with GMT now (that could add httpd's processing time to the
original value). Logging has also been improved from my initial
solution.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751138 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Jul 2016 14:09:43 +0000 (14:09 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751065 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Jul 2016 14:08:22 +0000 (14:08 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1751064 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 1 Jul 2016 15:08:10 +0000 (15:08 +0000)]
ab: follow up to r1750854: still better naming, and a C89 fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750960 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 1 Jul 2016 15:04:30 +0000 (15:04 +0000)]
ab: follow up to r1750854: some comments and better naming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750955 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 1 Jul 2016 15:00:42 +0000 (15:00 +0000)]
Fixed typo in log message, wrong RFC mentioned.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750953 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 1 Jul 2016 14:47:48 +0000 (14:47 +0000)]
ab: follow up to r1750854.
Use SNI when available by default, and invert -I logic to now disable it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750947 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 30 Jun 2016 19:01:41 +0000 (19:01 +0000)]
ab: follow up to r1750854: put the -I at the right place for apr_getopt().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750855 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 30 Jun 2016 18:48:40 +0000 (18:48 +0000)]
ab: add SNI support when available.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750854 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 30 Jun 2016 12:08:42 +0000 (12:08 +0000)]
modssl: reset client-verify state when renegotiation is aborted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750779 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 30 Jun 2016 07:20:49 +0000 (07:20 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750751 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 30 Jun 2016 07:19:39 +0000 (07:19 +0000)]
Update language on impact of disabling TRACE, remove reference to compliance.
Reviewed by: wrowe, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750750 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 30 Jun 2016 07:09:46 +0000 (07:09 +0000)]
Fix indentation and extra spaces of my previous commit, apologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750749 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 30 Jun 2016 07:00:31 +0000 (07:00 +0000)]
Log CGI/FCGI Last-Modified header value changes.
The Last-Modified header coming from a backend FCGI/CGI script is inspected
by util_script.c to enforce RFC2616 (https://tools.ietf.org/html/rfc2616#section-14.29).
The Last-Modified header also needs to be compliant with RFC882/1123 as stated in
https://tools.ietf.org/html/rfc2616#section-3.3.1, and one important assumption that
httpd makes (correctly, as the RFC suggests) is to assume the GMT timezone. If the datestr
returned by the FCGI/CGI script is set with a different timezone, then the value might be considered
"in the future" and replaced with GMT now() as calculated by httpd. Adding a trace log might
help sysadmins while debugging these kind of issues. This is a follow up of r1748379.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750747 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 28 Jun 2016 19:59:09 +0000 (19:59 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750574 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 28 Jun 2016 19:50:48 +0000 (19:50 +0000)]
svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750568 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 28 Jun 2016 19:50:47 +0000 (19:50 +0000)]
--enable-mods-[shared|static]=none has *never* done anything special.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750567 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 28 Jun 2016 19:27:22 +0000 (19:27 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750563 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 28 Jun 2016 19:21:05 +0000 (19:21 +0000)]
svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750560 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 28 Jun 2016 18:33:52 +0000 (18:33 +0000)]
Small change to r952007, ensure we don't wipe out the $enable_foomod value
when that value is 'shared'. The 'yes', 'shared', 'static' and 'no' values
are all valid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750553 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Jun 2016 13:48:44 +0000 (13:48 +0000)]
mod_proxy: follow up to r1750392 and r1750474.
Restore PROXY_WORKER_IS_USABLE() check in ap_proxy_connect_backend(), we must
obviously (un)put backend in error state based on the result of the actual
connect(), and don't change it in ap_proxy_check_backend()...
APR_SUCCESS return by ap_proxy_check_backend(), i.e. a usable worker and an
established connection, is enough for modules to continue w/o calling
ap_proxy_connect_backend(), still.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750508 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 28 Jun 2016 13:44:58 +0000 (13:44 +0000)]
Fix proxy balancer lbmethod --enable defaults to follow proxy_balancer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750507 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Jun 2016 12:10:34 +0000 (12:10 +0000)]
mod_proxy: follow up to r1750392: comment on proxy_conn_rec->tmp_bb.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750494 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Jun 2016 11:19:36 +0000 (11:19 +0000)]
mod_proxy: follow up to r1750392.
Avoid double checking the connection in ap_proxy_connect_backend() when
ap_proxy_check_backend() says it is up and good to go.
This can be done by moving the PROXY_WORKER_IS_USABLE() check in
ap_proxy_check_backend(), since it is called by ap_proxy_connect_backend(),
and not calling the latter if the former succeeded (for the modules using it).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750474 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Jun 2016 04:45:11 +0000 (04:45 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750445 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Jun 2016 04:39:22 +0000 (04:39 +0000)]
Be more consistent in <highlight> block layout in XML.
No visual change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750441 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 28 Jun 2016 03:43:36 +0000 (03:43 +0000)]
Fix typo as spotted by Wolfgang in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750439 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Jun 2016 22:05:54 +0000 (22:05 +0000)]
This is not C code... no semi, a colon is a noop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750420 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Jun 2016 22:05:31 +0000 (22:05 +0000)]
Undo r1750418, miscommitted a local test
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750419 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Jun 2016 22:04:13 +0000 (22:04 +0000)]
This isn't C ;) Colon for noop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750418 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 21:49:15 +0000 (21:49 +0000)]
mod_proxy: we don't need ap_proxy_ssl_connection_cleanup() anymore with
ap_proxy_check_backend() used at connection reuse time, so remove its last call and deprecate it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750416 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 21:45:45 +0000 (21:45 +0000)]
mod_proxy_http2: don't use ap_proxy_ssl_connection_cleanup(), there may be
data available on the backend connection before we reuse it (e.g. PING or SETTINGS change).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750414 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 21:39:53 +0000 (21:39 +0000)]
mod_proxy: use proxy_conn_rec->tmp_bb where appopriate to avoid temporary
brigade create/destroy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750412 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Jun 2016 19:47:52 +0000 (19:47 +0000)]
Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750407 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 17:26:12 +0000 (17:26 +0000)]
mod_proxy_{http,ajp,fcgi}}: don't reuse backend connections with data available
before the request is sent. PR 57832.
ap_proxy_check_backend() can be used before ap_proxy_connect_backend() to try
to read available data (including from the filters), and is called by
ap_proxy_connect_backend() to check the socket state only (as before, still
relevant after ap_proxy_check_backend() due to filter data which may not have
triggered a real socket operation).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750392 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 16:06:42 +0000 (16:06 +0000)]
mod_proxy: revert r1750301, r1750305 and r1750311.
Rework needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750376 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Jun 2016 13:45:02 +0000 (13:45 +0000)]
Ensure not-selected means 'no', once an APACHE_MODULE enable_foo is processed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750335 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 08:20:39 +0000 (08:20 +0000)]
mod_proxy: follow up to r1750301: APLOGNO().
[Reverted by r1750376]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750311 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 08:08:26 +0000 (08:08 +0000)]
mod_proxy: follow up to r1750301.
s/is_socket_connected/get_socket_connected/ in the !USE_ALTERNATE_IS_CONNECTED
case, and add CHANGE + MMN entries.
[Reverted by r1750376]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750305 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 Jun 2016 08:00:30 +0000 (08:00 +0000)]
mod_proxy: don't reuse backend connections with data available before the
request is sent. PR 57832.
[Reverted by r1750376]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750301 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 25 Jun 2016 18:56:28 +0000 (18:56 +0000)]
Follow up to r1737447: fix max_spare_threads lower bound.
Suggested by: Rick Houser <rick.houser jackson.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750218 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Jun 2016 17:58:54 +0000 (17:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750217 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Jun 2016 17:56:43 +0000 (17:56 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750216 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 24 Jun 2016 05:31:13 +0000 (05:31 +0000)]
Replace the proxy_mods_enable logic, with its hazardous 'yes' value that
aborts the build on missing dependencies, with a local override of the
module_selection as 'most', and module_default of the same shared|static
model that was requested through --enable-proxy.
[For trunk, we need to reevaluate the 'most' condition of some of the more
esoteric modules, and simply drop the module_default override; where a user
wants to enable -only- mod_proxy, plus one proxy mechanism, the legacy 2.4.x
behavior retained by this patch is nuts. For one example,
--enable-modules=few --enable-proxy-yes --enable-proxy_http
is a completely specific and legitimate syntax --- adding 10 other proxy
providers in response to this syntax is absurd.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1750043 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Jun 2016 16:05:00 +0000 (16:05 +0000)]
With correct and now-multiple dependency checking, drop this redundant test
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749933 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Jun 2016 15:42:30 +0000 (15:42 +0000)]
Promote any static module to yes|shared if a required dependency is not static
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749925 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Jun 2016 15:34:46 +0000 (15:34 +0000)]
Add watchdog by default at level 'most' for mod_proxy_hcheck
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749924 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 23 Jun 2016 06:05:30 +0000 (06:05 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749828 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 13:24:17 +0000 (13:24 +0000)]
mod_http2: fixing APLOG_NO overdose and some log levels
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749695 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Jun 2016 13:17:41 +0000 (13:17 +0000)]
assign IDs to new AH*'s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749693 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Jun 2016 13:15:57 +0000 (13:15 +0000)]
spatch some AH* IDs to pick up the new INFO level messages,
also hit old DEBUG messages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749688 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 13:11:46 +0000 (13:11 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749685 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 13:00:45 +0000 (13:00 +0000)]
Cause missing mod_watchdog to 'unset' the --enable-proxy default, rather than
disable the module. This forces the module logic to emit a warning of the
missing dependency; changes the output from
checking whether to enable mod_proxy_hcheck... no
to
configure: WARNING: "mod_watchdog is disabled but required for mod_proxy_hcheck"
checking whether to enable mod_proxy_hcheck... no (disabled)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749678 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 12:57:40 +0000 (12:57 +0000)]
mod_proxy_http2: fixed retry behaviour when proxy engine needs to retry its base request on a new connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749676 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 12:23:34 +0000 (12:23 +0000)]
Simplify, and correct the dependency handling of mod_proxy_hcheck
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749659 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 12:22:44 +0000 (12:22 +0000)]
Support multiple module dependencies for the final prereq argument to the
APACHE_MODULE macro, as a comma separated list, e.g.
APACHE_MODULE(proxy_http2, [...], [proxy,http2])
will evaluate the availability of mod_proxy, followed by mod_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749658 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 13:37:38 +0000 (13:37 +0000)]
mod_proxy_http2: improved retry when encountering errored/shutdown connections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1749505 13f79535 -47bb-0310-9956-
ffa450edef68