]>
granicus.if.org Git - apache/log
Yann Ylavic [Mon, 18 Sep 2017 16:55:13 +0000 (16:55 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808743 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 18 Sep 2017 16:40:44 +0000 (16:40 +0000)]
Not really a blocker, I just saw too much weirdness with floats ;)
Looks fine here though.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808742 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 18 Sep 2017 15:02:58 +0000 (15:02 +0000)]
it's an older code, but it checks out...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808728 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 18 Sep 2017 14:20:59 +0000 (14:20 +0000)]
lbfactr patch v2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808724 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 18 Sep 2017 13:05:46 +0000 (13:05 +0000)]
Merge r1801594 from trunk:
Add logic to read the Upgrade header and use it in the response.
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142
Submitted by: jfclere
Reviewed by: jfclere, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808698 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 15 Sep 2017 12:23:53 +0000 (12:23 +0000)]
prettify.js: update the js with the new Directives
Replaced the old list with what currently found in
https://httpd.apache.org/docs/current/mod/directives.html
This should allow a better highlight of new directives
like the mod_http2's ones
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808454 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 12 Sep 2017 08:37:54 +0000 (08:37 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808087 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 12 Sep 2017 08:18:06 +0000 (08:18 +0000)]
Proposed backport of r1808008
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1808086 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Sep 2017 13:25:22 +0000 (13:25 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807902 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Sep 2017 13:24:01 +0000 (13:24 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807898 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:55:05 +0000 (14:55 +0000)]
No CHANGES entry for a new feature?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807775 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:53:47 +0000 (14:53 +0000)]
Merge r1745039 from trunk:
include the scheme in the error message about missing a
mod_proxy_submodule (mod_proxy_$usually_a_scheme)
Submitted by: covener
Reviewed by: jim, ylavic, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807773 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:51:44 +0000 (14:51 +0000)]
Merge r1799435, r1799437, r1805206, r1805322 from trunk:
Allow WatchdogInterval to be sub 1 second
Allow finer control over hcheck intervals... minimum is whatever
the watchdog slice is.
Fix remaining lint from ms capability for hchecks.
userland change = we now are OK w/ ms
Submitted by: jim
Reviewed by: jim, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807772 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:36:31 +0000 (14:36 +0000)]
Merge r1803420, r1803454, r1804090 from trunk:
mod_http2: version bump, partial fix for stream response getting stuck, see https://github.com/icing/mod_h2/issues/143
mod_http2: signalling produce IO before waiting on beam buffer to drain.
mod_http2: non-dev version for backport
Submitted by: icing
Reviewed/backported by: icing, steffenal, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807771 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:14:41 +0000 (14:14 +0000)]
Merge r1793922, r1793923 from trunk:
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).
override index: clarify this doc's purpose
Based on feedback by elukey.
Submitted by: jchampion
Reviewed by: jchampion, jim, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807765 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:05:38 +0000 (14:05 +0000)]
Merge r1802845 from trunk:
Make sure updatelbstatus() is NULL
Submitted by: jim
Reviewed by: jim, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807763 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 14:01:07 +0000 (14:01 +0000)]
Follow up to r1807761: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807762 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 13:56:59 +0000 (13:56 +0000)]
Merge r1780441, r1780470, r1795928 from trunk:
buildconf: allow configuration without APR sources
Previously we required copying the APR (and APR-util) source code into
srclib or some other location on disk in order to build httpd directly
from source. This is annoying if you're on a distribution that already
has the required files in its APR dev packages.
Practically speaking, if you're not building an official distribution
tarball, you only need the following files:
1) config.guess
2) config.sub
3) find_apr.m4
4) find_apu.m4
5) PrintPath
1 and 2 come from automake. 3 and 4 are included in some distributions'
(e.g. Debian's) development packages for APR/-util. That leaves
PrintPath, which has not changed meaningfully in over a decade and is
checked in completely here.
Passing an apr-config executable to buildconf's --with-apr option will
now enable a mode in which the above files (minus PrintPath) are copied
from their respective homes, removing the need for APR sources on disk.
Otherwise, if a source tree is passed, the current behavior is retained
and all of the above files are copied from APR directly.
buildconf: add --help for the new behavior
buildconf's behavior is a little complicated (and was made more so with
apr-config mode), so add some self-documentation.
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.
Submitted by: jchampion
Reviewed by: jchampion, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807761 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 13:13:11 +0000 (13:13 +0000)]
Merge r1807655 from trunk:
core: Disallow Methods' registration at run time (.htaccess), they may be
used only if registered at init time (httpd.conf).
Calling ap_method_register() in children processes is not the right scope
since it won't be shared for all requests.
Reviewed by: ylavic, covener, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807754 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 13:10:16 +0000 (13:10 +0000)]
Merge r1766998 from trunk:
Follow up to r1739201.
These APR_TIMEUP special cases are now handled by ap_map_http_request_error().
Reviewed by: jailletc36, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807753 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 13:08:14 +0000 (13:08 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807752 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 12:20:16 +0000 (12:20 +0000)]
Merge r1803392, r1803396, r1803398 from trunk:
mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP
is defined. PR 61206.
Submitted by: Michael Schlenker <msc contact.de>
mod_ssl, ab: compatibility with LibreSSL. PR 61184.
LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with
all of the latest OpenSSL 1.1 API.
Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for
anything but OpenSSL >= 1.1 (for now).
Proposed by: Bernard Spil <brnrd freebsd.org>
Reviewed by: ylavic
Follow up to r1803396: CHANGES entry.
Reviewed by: ylavic, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807734 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 8 Sep 2017 12:14:48 +0000 (12:14 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807732 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 8 Sep 2017 12:12:43 +0000 (12:12 +0000)]
reverting prev commit with unwanted rev numbers on top dir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807731 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 8 Sep 2017 12:11:13 +0000 (12:11 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807730 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 10:17:21 +0000 (10:17 +0000)]
Merge r1784318 from trunk:
Support use of optional "tag" in syslog entries. Streamline the patch.
PR 60525.
Submitted by: jim
Reviewed by: rpluem, jim, mrumph
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807707 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 10:10:53 +0000 (10:10 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807706 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 8 Sep 2017 10:08:36 +0000 (10:08 +0000)]
Comment, vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807705 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 7 Sep 2017 23:48:18 +0000 (23:48 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807662 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 7 Sep 2017 23:47:17 +0000 (23:47 +0000)]
lots of votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807661 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 7 Sep 2017 23:40:37 +0000 (23:40 +0000)]
EPASTE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807660 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Sep 2017 22:46:58 +0000 (22:46 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807656 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 7 Sep 2017 11:09:06 +0000 (11:09 +0000)]
update feather to conform with styleguide.
https://apache.org/foundation/press/kit/ApacheFoundation_StyleGuide.pdf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1807588 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 1 Sep 2017 16:01:52 +0000 (16:01 +0000)]
Add suggestions to PROXY protocol proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806991 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Thu, 31 Aug 2017 17:29:29 +0000 (17:29 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806830 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 28 Aug 2017 11:03:53 +0000 (11:03 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806427 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 28 Aug 2017 11:03:03 +0000 (11:03 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806426 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 25 Aug 2017 19:59:24 +0000 (19:59 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1806222 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 23 Aug 2017 21:51:30 +0000 (21:51 +0000)]
Vote and suggest
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805966 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 22 Aug 2017 11:10:14 +0000 (11:10 +0000)]
And these backports look, and test, good. +1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805754 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 21 Aug 2017 13:45:11 +0000 (13:45 +0000)]
Rebuil.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805632 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 21 Aug 2017 13:44:27 +0000 (13:44 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805631 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Aug 2017 07:17:10 +0000 (07:17 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805489 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Aug 2017 18:39:58 +0000 (18:39 +0000)]
lgtm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805456 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Aug 2017 18:38:44 +0000 (18:38 +0000)]
syslog vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805455 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Aug 2017 18:37:34 +0000 (18:37 +0000)]
format change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805454 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 18 Aug 2017 08:50:03 +0000 (08:50 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805391 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 18 Aug 2017 08:49:42 +0000 (08:49 +0000)]
Merge
1805099 from trunk:
Fix ProxyAddHeaders merging.
* modules/proxy/mod_proxy.h:
Add add_forwarded_headers_set field to proxy_dir_conf.
* modules/proxy/mod_proxy.c (create_proxy_dir_config):
Initialize add_forwarded_headers_set.
(add_proxy_http_headers): Set it.
(merge_proxy_dir_config): Merge add_forwarded_headers correctly.
Reviewed by: jorton, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805390 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 18 Aug 2017 06:24:08 +0000 (06:24 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805366 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Aug 2017 18:59:32 +0000 (18:59 +0000)]
Tested and voted on proposals... Will try to do LibreSSL this
weekend.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805327 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Aug 2017 18:54:48 +0000 (18:54 +0000)]
2 backport proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805326 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:51:15 +0000 (16:51 +0000)]
create +1 vote line
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805224 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:50:29 +0000 (16:50 +0000)]
Merge r1713043, r1802305, r1802309 from trunk:
Save a few bytes in conf pool when processing 'Define'.
+ some minor style issues
+ split long lines
Be explicit and safe (const) with the strings stored in ap_server_config_defines.
Follow up to r1713043.
ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of
*const* strings (must not change after being inserted), make it explicit.
Submitted by: jailletc36, ylavic, ylavic
Reviewed by: ylavic, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805223 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:49:12 +0000 (16:49 +0000)]
Merge r1618555 from trunk:
prefork: Ignore SIGINT in child. This fixes race-condition in signals handling
when httpd is runnning on foreground and user hits ctrl+c. In this case, SIGINT
is sent to all children followed by SIGTERM from the main process, which
interrupts the SIGINT handler and leads to inconsistency (process freezes
or crashes).
Submitted by: jkaluza
Reviewed by: ylavic, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805222 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:48:29 +0000 (16:48 +0000)]
Merge r1789220, r1792675 from trunk:
core: Disallow multiple Listen on the same IP:port when listener buckets
are configured (ListenCoresBucketsRatio > 0), consistently with the single
bucket case (default), thus fixing the leak of the corresponding socket
descriptors on graceful restart.
Follow up to r1789220.
Document the implicit behaviour of ListenCoresBucketsRatio when multiple
Listen-ers are configured on the same IP:port.
Submitted by: ylavic
Reviewed by: ylavic, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805221 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:46:44 +0000 (16:46 +0000)]
promote those w/ 3 +1s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805219 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Aug 2017 16:45:52 +0000 (16:45 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805218 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 16 Aug 2017 05:34:07 +0000 (05:34 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805138 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 15 Aug 2017 17:56:41 +0000 (17:56 +0000)]
Votes*N, propose*1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1805109 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Sun, 6 Aug 2017 10:26:43 +0000 (10:26 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804229 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Sun, 6 Aug 2017 10:14:35 +0000 (10:14 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804228 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 4 Aug 2017 10:21:05 +0000 (10:21 +0000)]
mod_http2: backport proposal added
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804091 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 4 Aug 2017 01:23:59 +0000 (01:23 +0000)]
lost backport of log entry improvement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1804066 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 1 Aug 2017 15:41:54 +0000 (15:41 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803660 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 1 Aug 2017 15:40:48 +0000 (15:40 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803659 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 30 Jul 2017 06:44:16 +0000 (06:44 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803404 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 30 Jul 2017 06:43:41 +0000 (06:43 +0000)]
update for sync with English docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803403 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 29 Jul 2017 23:32:39 +0000 (23:32 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803399 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Jul 2017 17:49:44 +0000 (17:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803316 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 28 Jul 2017 17:48:16 +0000 (17:48 +0000)]
Merge r1803313 from trunk:
cross link some balancer directives across proxy mods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803315 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 28 Jul 2017 09:30:39 +0000 (09:30 +0000)]
Documentation update: part 2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803260 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 28 Jul 2017 09:29:46 +0000 (09:29 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803259 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 28 Jul 2017 09:29:20 +0000 (09:29 +0000)]
mod_proxy*.xml: improve connection reuse documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1803258 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Jul 2017 17:21:41 +0000 (17:21 +0000)]
extended warning catch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802846 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Jul 2017 15:33:12 +0000 (15:33 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802705 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Jul 2017 15:32:19 +0000 (15:32 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802704 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 19 Jul 2017 21:03:21 +0000 (21:03 +0000)]
Withdraw my mod_proxy_fcgi backport proposal
There has been some discussion over IRC about
possible performance issues with the current
code in certain scenarios (like a simple echo
FCGI backend that returns data as it comes in).
Jacob is working on a different solution, waiting
for his feedback before proceeding any further.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802431 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Jul 2017 15:09:53 +0000 (15:09 +0000)]
Propose syslog backport re: PR 60525
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802402 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Jul 2017 21:02:08 +0000 (21:02 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802339 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Jul 2017 21:00:43 +0000 (21:00 +0000)]
Merge r1802336 from trunk:
UDS does support reuse
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802337 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 18 Jul 2017 19:44:44 +0000 (19:44 +0000)]
Agreement between example and explanation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802328 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 18 Jul 2017 15:22:00 +0000 (15:22 +0000)]
Easy proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802310 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:54:46 +0000 (13:54 +0000)]
Merge r1762580, r1762701, r1762702, r1762718, r1762723, r1762742, r1762743, r1774538, r1779354 from trunk:
event: use atomics for *timeout_queue->total since it's updated concurrently,
and move TO_QUEUE_*() macros to functions.
event: add/remove from/to the pollset outside of the critical sections.
We don't need external locking since it's created with APR_POLLSET_THREADSAFE,
hence reduce those sections to the lowest cycles possible.
A spinlock may be interesting instead of the mutex now, we won't block and the
TO_QUEUE_*() and process_timeout_queue() operations are fast...
event: follow up to r1762701: update log tag.
event: avoid unnecessary listener/polling wake ups (context switches) by using
apr_pollset_wakeup(), when implemented, to signal the listener according to the
next timers or timeout queues expiry (updated at insert and maintenance time).
Follow up to r1762718: CHANGES entry.
event: follow up to r1762718.
We still need to kill kept-alive connections in normal/expiry processing if
the workers are busy or dying.
event: follow up to r1762718 and r1762742: put de condition where it belongs.
event: follow up to r1762718.
On graceful shutdown/restart, kill kept-alive connections before poll()ing
again, avoiding to wait for their "normal" timers (before being woken up)
when they remain the last handled connections.
event: follow up to r1762701.
Keep QUEUE_APPEND()+pollset_add() or QUEUE_REMOVE()+pollset_remove() atomic.
Otherwise when a worker adds an entry in some queue (e.g. KA, lingering), it
might race with the listener in the time between the mutex is released and the
pollset is updated; meanwhile the listener might process the queue and find an
entry no yet in its pollset.
For the lingering queue, the entry could then have been used after its pool
destroyed.
Submitted by: ylavic
Reviewed by: ylavic, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802146 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:44:30 +0000 (13:44 +0000)]
Merge r1754164, r1801994, r1801995 from trunk:
mod_proxy_wstunnel: we want to detect whether some response was sent to
the client when forwarding data from the backend to the client, not the
reverse.
Follow up to r1754164: CHANGES entry.
Follow up to r1801994: CHANGES' PR reference.
Submitted by: ylavic
Reviewed by: ylavic, jchampion, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802144 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:43:19 +0000 (13:43 +0000)]
promotes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802143 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:42:32 +0000 (13:42 +0000)]
some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802142 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Jul 2017 13:41:36 +0000 (13:41 +0000)]
Note release date for 2.4.27
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802141 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Jul 2017 11:06:52 +0000 (11:06 +0000)]
Credits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802129 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Jul 2017 10:32:45 +0000 (10:32 +0000)]
Add CHANGES' security entries for 2.4.27.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802121 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 16 Jul 2017 16:15:28 +0000 (16:15 +0000)]
Propose backport of r1802040
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1802077 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Fri, 14 Jul 2017 23:05:16 +0000 (23:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801999 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 14 Jul 2017 22:32:08 +0000 (22:32 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801997 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 12 Jul 2017 00:41:44 +0000 (00:41 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801668 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 11 Jul 2017 12:15:34 +0000 (12:15 +0000)]
Propose fix for PR 61142
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801602 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 10 Jul 2017 18:06:28 +0000 (18:06 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801507 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Jul 2017 14:17:22 +0000 (14:17 +0000)]
Point to 2.4.28-dev version of patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801472 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 8 Jul 2017 14:33:25 +0000 (14:33 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801291 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 17:39:58 +0000 (17:39 +0000)]
And we are 2.4.28-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801086 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 17:37:42 +0000 (17:37 +0000)]
Get ready to tag 2.4.27
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801084 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Jul 2017 16:25:24 +0000 (16:25 +0000)]
make COMPATIBILITY entries explicit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1801080 13f79535 -47bb-0310-9956-
ffa450edef68