]> granicus.if.org Git - apache/log
apache
8 years agoForce mod_proxy_fcgi to read the whole FCGI response
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

8 years agoCMake: quote installation paths
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

8 years agoCMake: use generator expressions to find output files
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

8 years agoCMake: use CMAKE_REQUIRED_INCLUDES to find APR macros
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

8 years agomod_http2: no master timeout while requests are ongoing
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

8 years agoupdate transformation
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

8 years agofix properties
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

8 years agomod_crypto: Add the all purpose crypto filters with support for HLS.
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

8 years agoupdate after backport
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

8 years agomod_http2: fixing flush on SETTINGS frames without open streams
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

8 years agoRebuild.
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

8 years agoXML updates.
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

8 years agoPR59815: rewrite per-directory + fcgi broken in 2.4.23
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

8 years agoxform
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

8 years agomention mod_cgid too
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

8 years agorebuild
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

8 years agoRemove reference to long-dead website that once upon a time used this functionality.
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

8 years agoGive an example of converting a password file from one format to the
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

8 years agoUpdated description of the change to reflect the last patch
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

8 years agoUpdated credits after Yann's patch
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

8 years agoImprove the FCGI/CGI Last-Modified header value handling.
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

8 years agoRebuild.
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

8 years agoXML update.
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

8 years agoab: follow up to r1750854: still better naming, and a C89 fix.
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

8 years agoab: follow up to r1750854: some comments and better naming.
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

8 years agoFixed typo in log message, wrong RFC mentioned.
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

8 years agoab: follow up to r1750854.
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

8 years agoab: follow up to r1750854: put the -I at the right place for apr_getopt().
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

8 years agoab: add SNI support when available.
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

8 years agomodssl: reset client-verify state when renegotiation is aborted
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

8 years agoUpdate transformations.
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

8 years agoUpdate language on impact of disabling TRACE, remove reference to compliance.
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

8 years agoFix indentation and extra spaces of my previous commit, apologies.
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

8 years agoLog CGI/FCGI Last-Modified header value changes.
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

8 years agoupdate transformation
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

8 years agosvn:eol-style = native
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

8 years ago--enable-mods-[shared|static]=none has *never* done anything special.
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

8 years agoupdate transformation
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

8 years agosvn:eol-style = native
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

8 years agoSmall change to r952007, ensure we don't wipe out the $enable_foomod value
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

8 years agomod_proxy: follow up to r1750392 and r1750474.
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

8 years agoFix proxy balancer lbmethod --enable defaults to follow proxy_balancer
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

8 years agomod_proxy: follow up to r1750392: comment on proxy_conn_rec->tmp_bb.
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

8 years agomod_proxy: follow up to r1750392.
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

8 years agoxforms
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

8 years agoBe more consistent in <highlight> block layout in XML.
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

8 years agoFix typo as spotted by Wolfgang in online doc
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

8 years agoThis is not C code... no semi, a colon is a noop
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

8 years agoUndo r1750418, miscommitted a local test
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

8 years agoThis isn't C ;) Colon for noop
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

8 years agomod_proxy: we don't need ap_proxy_ssl_connection_cleanup() anymore with
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

8 years agomod_proxy_http2: don't use ap_proxy_ssl_connection_cleanup(), there may be
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

8 years agomod_proxy: use proxy_conn_rec->tmp_bb where appopriate to avoid temporary
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

8 years agoAccount for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'
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

8 years agomod_proxy_{http,ajp,fcgi}}: don't reuse backend connections with data available
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

8 years agomod_proxy: revert r1750301, r1750305 and r1750311.
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

8 years agoEnsure not-selected means 'no', once an APACHE_MODULE enable_foo is processed
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

8 years agomod_proxy: follow up to r1750301: APLOGNO().
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

8 years agomod_proxy: follow up to r1750301.
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

8 years agomod_proxy: don't reuse backend connections with data available before the
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

8 years agoFollow up to r1737447: fix max_spare_threads lower bound.
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

8 years agoRebuild.
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

8 years agoXML update.
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

8 years agoReplace the proxy_mods_enable logic, with its hazardous 'yes' value that
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

8 years agoWith correct and now-multiple dependency checking, drop this redundant test
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

8 years agoPromote any static module to yes|shared if a required dependency is not static
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

8 years agoAdd watchdog by default at level 'most' for mod_proxy_hcheck
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

8 years agoFix typo
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

8 years agomod_http2: fixing APLOG_NO overdose and some log levels
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

8 years agoassign IDs to new AH*'s
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

8 years agospatch some AH* IDs to pick up the new INFO level messages,
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

8 years agoupdate after backport
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

8 years agoCause missing mod_watchdog to 'unset' the --enable-proxy default, rather than
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

8 years agomod_proxy_http2: fixed retry behaviour when proxy engine needs to retry its base...
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

8 years agoSimplify, and correct the dependency handling of mod_proxy_hcheck
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

8 years agoSupport multiple module dependencies for the final prereq argument to the
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

8 years agomod_proxy_http2: improved retry when encountering errored/shutdown connections
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

8 years agoAdd CHANGES entry for r1749401
Christophe Jaillet [Mon, 20 Jun 2016 21:12:13 +0000 (21:12 +0000)]
Add CHANGES entry for r1749401

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

8 years agoUse 'memcpy' instead of 'strcpy' when the size of the string has already been computed.
Christophe Jaillet [Mon, 20 Jun 2016 21:08:43 +0000 (21:08 +0000)]
Use 'memcpy' instead of 'strcpy' when the size of the string has already been computed.

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

8 years agoStyle only
Christophe Jaillet [Mon, 20 Jun 2016 21:07:26 +0000 (21:07 +0000)]
Style only

Be more consistent:
   - add space between (if|while) and \(
   - place of 'break ' statement

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

8 years agoFix 'x' command processing in mod_sed.
Christophe Jaillet [Mon, 20 Jun 2016 21:03:07 +0000 (21:03 +0000)]
Fix 'x' command processing in mod_sed.

This has been tested using a slighly modified example taken from:
    https://blogs.oracle.com/basant/entry/using_mod_sed_to_filter
(OutputSed "s/.\*//"             has been changed in                OutputSed "s/.*//")

OutputSed "/Sunday/ {"
OutputSed "h"
OutputSed "s/.*//"
OutputSed "N"
OutputSed "s/\^.//"
OutputSed     "/Monday/ {"
OutputSed         "x"
OutputSed         "s/Sunday/Monday/"
OutputSed         "x"
OutputSed         "s/Monday/Tuesday/"
OutputSed         "H"
OutputSed         "g"
OutputSed     "}"
OutputSed "}"

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

8 years agomod_http2: fix for request abort when connections drops, introduced in 1.5.8
Stefan Eissing [Sun, 19 Jun 2016 11:15:58 +0000 (11:15 +0000)]
mod_http2: fix for request abort when connections drops, introduced in 1.5.8

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

8 years agoRebuild.
Lucien Gentis [Sat, 18 Jun 2016 14:00:15 +0000 (14:00 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 18 Jun 2016 13:59:24 +0000 (13:59 +0000)]
XML update.

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

8 years agoDocumentation rebuild
Luca Toscano [Sat, 18 Jun 2016 10:14:08 +0000 (10:14 +0000)]
Documentation rebuild

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

8 years agoFollow up about DNS Resolution cache in mod-proxy after
Luca Toscano [Sat, 18 Jun 2016 10:13:42 +0000 (10:13 +0000)]
Follow up about DNS Resolution cache in mod-proxy after
a users@ email thread ("mod_proxy and DNS resolving").
Review from devs would be really appreciated, I'd like to
backport this info asap to 2.4.x.

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

8 years ago* If enable_proxy_hcheck is unset handle it like other proxy modules
Ruediger Pluem [Fri, 17 Jun 2016 18:29:16 +0000 (18:29 +0000)]
* If enable_proxy_hcheck is unset handle it like other proxy modules

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

8 years agoFix a potential buffer overflow.
Christophe Jaillet [Thu, 16 Jun 2016 05:17:35 +0000 (05:17 +0000)]
Fix a potential buffer overflow.

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

8 years agocore: removing quirk for supressing h2 in Upgrade: response header, never backported...
Stefan Eissing [Wed, 15 Jun 2016 14:47:21 +0000 (14:47 +0000)]
core: removing quirk for supressing h2 in Upgrade: response header, never backported, obsolete

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

8 years ago* Fix compilation error introduced in r1748322 by double typedef
Ruediger Pluem [Wed, 15 Jun 2016 11:34:45 +0000 (11:34 +0000)]
* Fix compilation error introduced in r1748322 by double typedef

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

8 years agomod_http2: update after backport
Stefan Eissing [Wed, 15 Jun 2016 10:07:03 +0000 (10:07 +0000)]
mod_http2: update after backport

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

8 years agomod_http2: more rigid error handling in DATA frame assembly
Stefan Eissing [Wed, 15 Jun 2016 09:30:14 +0000 (09:30 +0000)]
mod_http2: more rigid error handling in DATA frame assembly

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

8 years agoPrepare to backport, this is not specific to VS 2015...
William A. Rowe Jr [Tue, 14 Jun 2016 18:32:27 +0000 (18:32 +0000)]
Prepare to backport, this is not specific to VS 2015...

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

8 years agoDrop an invalid Last-Modified header value returned by a FCGI/CGI
Luca Toscano [Tue, 14 Jun 2016 10:35:23 +0000 (10:35 +0000)]
Drop an invalid Last-Modified header value returned by a FCGI/CGI
script instead tranforming it to Unix Epoch.

This bug was mentioned in the users@ mailing list and outlined in
the following centos bug: https://bugs.centos.org/view.php?id=10940
To reproduce the issue it is sufficient to connect mod-fastcgi
to a PHP script that returns a HTTP response with
the header "Last-Modified: foo". The header will be modified by
script_util.c to "Last-Modified: Thu, 01 Jan 1970 00:00:00 GMT".
Dropping an invalid header in this case seems to be the most
consistent and correct option in my opinion, plus it shouldn't
break existing configurations. Returning Unix Epoch might be
dangerous and should be avoided, but please let me know your opinions.
Moreover this is my first commit outside the documentation court,
I hope to have got the procedure right.
This fix has been tested also with the 2.4.x branch.

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

8 years agomod_http2: version bump after backport
Stefan Eissing [Tue, 14 Jun 2016 10:12:22 +0000 (10:12 +0000)]
mod_http2: version bump after backport

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

8 years agomod_ssl: follow up to r1734561.
Yann Ylavic [Tue, 14 Jun 2016 09:35:13 +0000 (09:35 +0000)]
mod_ssl: follow up to r1734561.
Don't enable CRL checks/flags by default.

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

8 years agoAllow other modules to become providers and add ACLs
Graham Leggett [Mon, 13 Jun 2016 22:33:35 +0000 (22:33 +0000)]
Allow other modules to become providers and add ACLs
to the DAV response. Requires apr-util v1.6+.

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

8 years agobackported to 2.4.21-dev
Jim Jagielski [Mon, 13 Jun 2016 13:05:46 +0000 (13:05 +0000)]
backported to 2.4.21-dev

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

8 years agomod_dav: making mod_dav.h compile with clang again
Stefan Eissing [Mon, 13 Jun 2016 09:31:09 +0000 (09:31 +0000)]
mod_dav: making mod_dav.h compile with clang again

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

8 years agomod_dav: Add dav_begin_multistatus, dav_send_one_response,
Graham Leggett [Sun, 12 Jun 2016 20:23:21 +0000 (20:23 +0000)]
mod_dav: Add dav_begin_multistatus, dav_send_one_response,
dav_finish_multistatus, dav_send_multistatus, dav_handle_err,
dav_failed_proppatch, dav_success_proppatch to mod_dav.h.

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