]>
granicus.if.org Git - apache/log
Christophe Jaillet [Sat, 26 Jan 2019 12:51:05 +0000 (12:51 +0000)]
Remove a useless compatibility note.
It is already stated at the very begining of the page.
Add a missing ')' to ease reading
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1852223 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 25 Jan 2019 13:33:07 +0000 (13:33 +0000)]
mod_ssl: give mod_md the chance to override certificate after ALPN protocol negotiation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1852128 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 25 Jan 2019 09:27:39 +0000 (09:27 +0000)]
mod_http2: fixed slave connection keepalives counter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1852101 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 24 Jan 2019 15:25:52 +0000 (15:25 +0000)]
mod_http2: enable re-use of slave connections again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1852038 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 24 Jan 2019 15:21:04 +0000 (15:21 +0000)]
reverting last change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1852037 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 24 Jan 2019 15:10:34 +0000 (15:10 +0000)]
mod_http2: enable re-use of slave connections again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1852032 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 23 Jan 2019 18:25:50 +0000 (18:25 +0000)]
revert of r808895 somehow missed mod_proxy_ftp
r808895 added `ServerTokens OFF` so some modules were
switched from ap_get_server_banner() to
ap_get_server_description() so they would never be empty.
But ap_get_server_description() is documnented as being for local
use only, so it was not really a suitable replacement much less
w/ `ServerTokens OFF` subsequently taken out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851954 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 22 Jan 2019 09:53:04 +0000 (09:53 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851794 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 22 Jan 2019 09:27:15 +0000 (09:27 +0000)]
Copy the "Note about /" note from the Location
explanation to the LocationMatch explanation.
Probably more people use LocationMatch than
Location with "~".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851790 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 20 Jan 2019 09:55:41 +0000 (09:55 +0000)]
Fix a typo reported by [stephane.blondon gmail.com]
PR 63092
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851702 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Jan 2019 14:42:23 +0000 (14:42 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851673 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Jan 2019 14:22:40 +0000 (14:22 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851671 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 18 Jan 2019 20:50:40 +0000 (20:50 +0000)]
Add compatibility note missing in r1740967
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851643 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 17 Jan 2019 17:19:04 +0000 (17:19 +0000)]
Clarify potentially unsuccessful success results.
Curious why modules/aaa/mod_authz_dbm.c:get_dbm_grp() doesn't need the same
net changes?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851552 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 15 Jan 2019 12:40:11 +0000 (12:40 +0000)]
mod_lua was moved to stable; https://s.apache.org/Xnh1
also linting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851338 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 15 Jan 2019 10:14:57 +0000 (10:14 +0000)]
fix a misleading comment about s->defn_name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851332 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 13 Jan 2019 12:51:42 +0000 (12:51 +0000)]
Reverse the order of 2 tests to potentially save a few cycles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851198 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Jan 2019 15:42:15 +0000 (15:42 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851178 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Jan 2019 15:40:57 +0000 (15:40 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851177 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Jan 2019 15:31:26 +0000 (15:31 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851173 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Jan 2019 15:29:08 +0000 (15:29 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851172 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Jan 2019 15:28:10 +0000 (15:28 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851171 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 12 Jan 2019 13:50:26 +0000 (13:50 +0000)]
Give a littlet breath before the permalink
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851168 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 12 Jan 2019 13:38:03 +0000 (13:38 +0000)]
Follow up to r1828588.
Update css to have permalink more in line with httpd.a.o:
- default to white (blue on dark-blue is not really visible)
- visible only when the mouse is over the corresponding heading
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851167 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 12 Jan 2019 08:32:14 +0000 (08:32 +0000)]
Remove the default CacheKeyBaseURL value, it doesn't have any.
Improve syntax highlight and hyper-links.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851152 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 12 Jan 2019 07:51:48 +0000 (07:51 +0000)]
When a :port is included in the CacheKeyBaseURL the ":" is lost from the actual cache key value. This doesn't harm apache by itself, the real problem arise if some external program which "knows" about the cache keys structure is used to modify the cache.
When CacheKeyBaseURL is not use, the ":" is kept.
So, be consistent when building the key and keep the ":" in all cases.
PR 53915 [Rein Tollevik <rein basefarm.no>]
+ merge 2 lines of a comment to have it more compact
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851146 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 11 Jan 2019 21:24:47 +0000 (21:24 +0000)]
Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851100 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 11 Jan 2019 19:31:43 +0000 (19:31 +0000)]
Fix websocket proxy over UDS.
configuration example:
<Location "/apis">
ProxyPass unix:/var/run/unix.sock|ws://127.0.0.1/api
</Location>
Currently 'ap_proxy_get_worker()' can't get matched pre-defined worker because
of different uri formatting in 'proxy_wstunnel_canon()' and ap_proxy_define_worker()'
PR 62932 <pavel dcmsys.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1851093 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 10 Jan 2019 22:41:59 +0000 (22:41 +0000)]
LanguagePriority should be case-insensitive in order to match AddLanguage behavior. PR 39730
Test case added in r1850983
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850989 13f79535 -47bb-0310-9956-
ffa450edef68
Hank Ibell [Thu, 10 Jan 2019 15:52:31 +0000 (15:52 +0000)]
Always decode session attributes early.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850947 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 10 Jan 2019 15:46:07 +0000 (15:46 +0000)]
* modules/ssl/ssl_engine_io.c (bio_filter_out_write,
bio_filter_in_read): Clear retry flags before aborting
on client-initiated reneg.
PR: 63052
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850946 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 9 Jan 2019 20:21:41 +0000 (20:21 +0000)]
Resync several generated docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850900 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 9 Jan 2019 09:34:34 +0000 (09:34 +0000)]
* modules/aaa/mod_authn_dbm.c (fetch_dbm_value): No functional change:
return APR_SUCCESS rather than rv, which is guaranteed to be
APR_SUCCESS in current code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850835 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 9 Jan 2019 09:31:26 +0000 (09:31 +0000)]
* modules/md/md_acme_drive.c (acme_driver_init):
Remove written-but-not-read variable (gcc 8.x warning).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850834 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Sperling [Tue, 8 Jan 2019 15:02:15 +0000 (15:02 +0000)]
Make mod_dialup.c compile when APR has no thread support.
+1 from covener and jim on dev@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850757 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Jan 2019 13:12:34 +0000 (13:12 +0000)]
This just got me. I upgraded macOS to Mojave (w/ latest Xcode) and I always build w/ maintainer-mode. The problem is that libxml2 will include various unicode/*.h files that have C++ type comments, which causes building to fail (due to Werror). Work around this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850745 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 6 Jan 2019 11:36:54 +0000 (11:36 +0000)]
Add new modules to the list of the 2.4 new features list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850545 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 6 Jan 2019 11:35:41 +0000 (11:35 +0000)]
Add compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850544 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 6 Jan 2019 11:11:20 +0000 (11:11 +0000)]
Add compatibility note as already noted in new_features_2_4.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850539 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 1 Jan 2019 20:52:56 +0000 (20:52 +0000)]
Docs rebuild after copyright year update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850117 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 1 Jan 2019 12:07:58 +0000 (12:07 +0000)]
Happy New Year 2019
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1850098 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Sperling [Sun, 23 Dec 2018 14:26:06 +0000 (14:26 +0000)]
Use apr_uint64_t instead of uint64_t; Pointed out by ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849630 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Sperling [Sun, 23 Dec 2018 09:26:56 +0000 (09:26 +0000)]
Avoid hard-coded "%ld" format strings in mod_deflate's logging statements.
On some platforms (e.g. OpenBSD) zlib's input/output counters are off_t
instead of ulong, which resuls in format-string warnings from some
compilers (e.g. clang). Work around this by upcasting to uint64_t.
Discussed on dev@ with ylavic and wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849590 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2018 17:29:05 +0000 (17:29 +0000)]
And we are at 2.5.1...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849325 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 19 Dec 2018 17:17:52 +0000 (17:17 +0000)]
For posterity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849323 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 19 Dec 2018 12:57:05 +0000 (12:57 +0000)]
mod_http2: mergine trunk+2.4.x code divergences back into a single source with proper MMN checks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849296 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Dec 2018 13:58:31 +0000 (13:58 +0000)]
Update after backport of r1849174 r1849174
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849177 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Dec 2018 13:45:25 +0000 (13:45 +0000)]
*) mod_md: incorrect behaviour when synchronizing ongoing ACME challenges
have been fixed. [Michael Kaufmann, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1849174 13f79535 -47bb-0310-9956-
ffa450edef68
Hank Ibell [Wed, 5 Dec 2018 19:13:38 +0000 (19:13 +0000)]
core: Fix incorrect substitution of env vars in directives containing multiple env vars.
In ap_resolve_env(), the string returned from getenv() should be copied since
the returned string may be statically allocated.
This fixes an issue where the value for the last env var is substituted for all
env vars in a directive containing multiple env vars.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1848236 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Dec 2018 15:05:05 +0000 (15:05 +0000)]
Bump seems to have been missed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1848047 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 25 Nov 2018 21:15:21 +0000 (21:15 +0000)]
core: Split out the ability to parse wildcard files and directories
from the Include/IncludeOptional directives into a generic set of
functions ap_dir_nofnmatch() and ap_dir_fnmatch().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1847430 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Fri, 23 Nov 2018 17:10:45 +0000 (17:10 +0000)]
Arrange the xml display and make it uses xml.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1847295 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Fri, 23 Nov 2018 09:36:36 +0000 (09:36 +0000)]
fix incorrect rv. Sorry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1847234 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Fri, 23 Nov 2018 09:32:20 +0000 (09:32 +0000)]
Add error messages and return bad request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1847232 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 15 Nov 2018 13:19:32 +0000 (13:19 +0000)]
* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846651 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Nov 2018 08:22:48 +0000 (08:22 +0000)]
CHANGES related to r1842010.
I have choosen "unlikely" because this bug has been around for ever ([1]) and the pool is only "cleared"; that is to say, the data is still valid, but the memory *could* be re-used.
[1]: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?revision=85717&view=markup&sortby=date#l1610
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846339 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Nov 2018 13:48:12 +0000 (13:48 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846310 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Nov 2018 13:47:08 +0000 (13:47 +0000)]
fr doc XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846309 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Nov 2018 16:33:04 +0000 (16:33 +0000)]
* support/htpasswd.c (usage): Fix bcrypt round maximum.
* docs/manual/programs/htpasswd.xml: Document that bcrypt rounds are
capped at 17.
PR: 62078
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846254 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Nov 2018 16:02:21 +0000 (16:02 +0000)]
* support/suexec.c (clean_env): Avoid use of sprintf; no functional change.
PR: 33207
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846253 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 8 Nov 2018 10:55:08 +0000 (10:55 +0000)]
mod_http2: version bump, slave connections cleanup strategy changed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846125 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 8 Nov 2018 10:09:21 +0000 (10:09 +0000)]
*) mod_ssl: Fix mod_authz provider for "require ssl" directive to check correctly
on HTTP/2 connections. Fixes PR 62654. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1846111 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 5 Nov 2018 10:37:32 +0000 (10:37 +0000)]
*) mod_ssl: clear *SSL errors before loading certificates and checking
afterwards. Otherwise errors are reported when other SSL using modules
are in play. Fixes PR 62880. [Michael Kaufmann]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1845768 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Nov 2018 11:09:40 +0000 (11:09 +0000)]
* Makefile.in (check-yes): Re-run make before running t/TEST in case
Apache::Test is stale and needs updating.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1845441 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 28 Oct 2018 20:55:43 +0000 (20:55 +0000)]
Revert r1844928 and follow up r1844942.
Actually *len can be > 0 here, at least without a change I'm working on but now
think should be discussed first probably. Anyway r1844928 alone is broken, just
rollback for now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1845064 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Oct 2018 12:52:09 +0000 (12:52 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844960 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Oct 2018 12:50:48 +0000 (12:50 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844958 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 27 Oct 2018 07:33:57 +0000 (07:33 +0000)]
mod_ssl: follow up to r1844928: revert an unintentional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844942 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 26 Oct 2018 22:00:30 +0000 (22:00 +0000)]
mod_ssl: axe dead code.
No functional change, we never get there when *len > 0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844928 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Oct 2018 10:24:17 +0000 (10:24 +0000)]
* Add a command to dump some data from the scoreboard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844889 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Oct 2018 15:43:35 +0000 (15:43 +0000)]
mod_ssl: follow up to r1844779: fix rollback in char_buffer_consume().
This needs the same bucket insertion code as in char_buffer_write(), so define
a new char_buffer_insert() helper.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844781 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Oct 2018 15:06:04 +0000 (15:06 +0000)]
request: forward as much buckets as possible in ap_request_core_filter().
This improves performances while still preventing morphing buckets bound to
r->pool from reaching connection filters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844780 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Oct 2018 14:55:44 +0000 (14:55 +0000)]
mod_ssl: bind buffered data to filter's pending data.
Otherwise they are not considered by ap_filter_input_pending() and pipelining
is not detected (MPM event times out).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844779 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 22 Oct 2018 20:45:11 +0000 (20:45 +0000)]
Retsore 2.4.x default behavior modified in r1557580.
Update doc accordingly.
Slightly tweak mod_speling doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844598 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 22 Oct 2018 13:15:54 +0000 (13:15 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844557 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 22 Oct 2018 13:15:30 +0000 (13:15 +0000)]
mod_proxy.xml: explicitly state that proxypass cannot be used with If
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844556 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 21 Oct 2018 12:10:09 +0000 (12:10 +0000)]
Fx a likely typo in r1842929: runtimedir plus
statedir instead of runtimedir twice.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844484 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Oct 2018 15:04:17 +0000 (15:04 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844421 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Oct 2018 15:02:32 +0000 (15:02 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844420 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 20 Oct 2018 09:31:43 +0000 (09:31 +0000)]
STATUS: added item to the wishlist for 2.next
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844403 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 20 Oct 2018 09:22:16 +0000 (09:22 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844402 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 20 Oct 2018 09:21:47 +0000 (09:21 +0000)]
mod_headers.xml: clarify the difference between
onsuccess vs always
In PR 62380 a user was confused why Header set always
was not overriding a header set by a HTTP backend managed
via mod_proxy_http. The difference between 'onsuccess'
and 'always' is really subtle, even if somebody is familiar
with r->headers_out and r->err_headers_out and the httpd's
internals.
As Stefan mentioned over email, the absence of a "normalized"
headers list in the response should be explained, so I tried to
do so in this commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844401 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Oct 2018 16:19:39 +0000 (16:19 +0000)]
* modules/ssl/ssl_engine_init.c: Fix typo in log message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844354 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 19 Oct 2018 15:57:06 +0000 (15:57 +0000)]
Fix a shadow (and useless) variable.
Fix a cppcheck warning and a style issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844352 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Oct 2018 13:21:11 +0000 (13:21 +0000)]
* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log
message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844343 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 17 Oct 2018 12:48:18 +0000 (12:48 +0000)]
rollback
1844001 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844090 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 16 Oct 2018 12:55:01 +0000 (12:55 +0000)]
* Correctly merge configurations that have client certificates set
by SSLProxyMachineCertificate{File|Path}.
The certificates and keys loaded during configuration time got lost during
runtime if e.g. SSLProxyMachineCertificate{File|Path} was set on virtual host
level and there was an SSL directive at directory level, e.g. SSLRequire.
This fixes a regression likely introduced in r1740928.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844002 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 16 Oct 2018 12:53:18 +0000 (12:53 +0000)]
And a way to custom modules to guess and extract ssl variable.
See https://github.com/jfclere/JBCSP-17 for example...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844001 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Oct 2018 21:14:21 +0000 (21:14 +0000)]
SSL_read() doesn't distinguish between return value 0 and <0,
at least not for OpenSSL 1.1.1. This is documented in the man
page for SSL_read and let to h2 failures when using OpenSSL 1.1.1.
When no data could be read, our code returned EAGAIN up until
OpenSSL 1.1.0, but APR_EOF for OpenSSL 1.1.1.
Now instead check SSL_get_error() also when SSL_read() returns 0.
To keep changes small, this change should not influence behavior,
when (rc=SSL_read()):
- rc < 0
- rc == 0 && *len > 0
- rc == 0 &&
(APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) &&
inctx->block == APR_NONBLOCK_READ
Behavior changes if
- rc == 0 &&
!(APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) &&
!*len > 0
Instead of APR_EOF:
- same behavior as rc < 0 for SSL_ERROR_WANT_READ
- same behavior as rc < 0 for SSL_ERROR_SYSCALL && APR_STATUS_IS_EAGAIN(inctx->rc)
Another change is that rc == 0 && ssl_err == SSL_ERROR_ZERO_RETURN
also results in APR_EOF.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843954 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Oct 2018 19:25:20 +0000 (19:25 +0000)]
* Ensure that aborted connections are logged as such.
Set c->aborted before apr_brigade_cleanup to have the correct status
when logging the request as apr_brigade_cleanup triggers the logging
of the request if it contains an EOR bucket.
PR: 62823
Submitted by: Arnaud Grandville <contact@grandville.net>
Reviewed by:rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843939 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 13 Oct 2018 12:10:49 +0000 (12:10 +0000)]
md_acme_drive.c: remove unused variable
Compiling in maintainer mode leads to a failure
due to challenges_configured initialized but
not used. Removing it seems harmless, Stefan
please let me know if this is not the case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843743 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 15:19:19 +0000 (15:19 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843677 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 15:18:23 +0000 (15:18 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843676 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 14:43:56 +0000 (14:43 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843671 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 14:39:21 +0000 (14:39 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843670 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 11 Oct 2018 11:22:55 +0000 (11:22 +0000)]
On the trunk:
mod_md: eliminating compiler warnings re signedness and unused. Adding a APLOG_WARNING
when the only available ACME challenge is "tls-sni-01" since Let's Encrypt will
disable that completely beginning of 2019.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843543 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 10 Oct 2018 21:47:53 +0000 (21:47 +0000)]
mpm_event: avoid AH00484 with idle threads
mpm_event: Stop issuing AH00484 "server reached MaxRequestWorkers..." when
there are still idle threads available. When there are less idle threads than
MinSpareThreads, issue new one-time message AH10159. Matches worker MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843513 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 12:02:34 +0000 (12:02 +0000)]
Eliminating some advanced conversion and shadow declaration compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843430 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 11:35:48 +0000 (11:35 +0000)]
mod_http2: adding defensive code for stream EOS handling, in case the request handler
missed to signal it the normal way (eos buckets). Addresses github issues
https://github.com/icing/mod_h2/issues/164, https://github.com/icing/mod_h2/issues/167
and https://github.com/icing/mod_h2/issues/170.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843426 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 11:22:53 +0000 (11:22 +0000)]
mod_http2: bringing some signed/unsigned casting goodness, aligning with github mod-h2 again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843424 13f79535 -47bb-0310-9956-
ffa450edef68