]>
granicus.if.org Git - apache/log
Eric Covener [Mon, 17 Jun 2019 18:35:24 +0000 (18:35 +0000)]
add RedirectRelative directive to allow relative Redirect targets
2616 forbade relative redirect URLs, but 7231 allows them
Early 2.2 maintenance levels did not fix them up, but later 2.2 and all 2.4
fixed them up with ap_construct_url().
Allow opt-in to not fixing up relative URLs with RedirectRelative
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861542 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 17 Jun 2019 17:06:34 +0000 (17:06 +0000)]
style: cmd_rec at the bottom
no functional change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861528 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 14:09:27 +0000 (14:09 +0000)]
Add missing space in default string of MimeOptions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861457 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 14:02:30 +0000 (14:02 +0000)]
Fix:
- some missing syntax highlight
- a default value not refelcted in quickreference
- a missing link between
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861455 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 12:02:18 +0000 (12:02 +0000)]
Fix an example in doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861449 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 11:25:06 +0000 (11:25 +0000)]
Fix an example in doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861448 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 09:07:49 +0000 (09:07 +0000)]
'flags' are optional in SSLCARevocationCheck. Update the syntax accordingly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861442 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Jun 2019 08:46:36 +0000 (08:46 +0000)]
Fix missing description of 2 directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861439 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Jun 2019 19:39:48 +0000 (19:39 +0000)]
use the provided types via the macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861432 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Jun 2019 12:01:01 +0000 (12:01 +0000)]
* mod_http2: adding support for the new trailer tests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861338 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Jun 2019 11:59:33 +0000 (11:59 +0000)]
*) mod_proxy_http2: adding support for handling trailers in both directions. PR 63502.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861337 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 14 Jun 2019 11:58:00 +0000 (11:58 +0000)]
Avoid duplicated APLOGNO.
In this case, the difference is tiny, but it could ease diagniostic (and numbers are cheap anyway)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861336 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 14 Jun 2019 11:52:25 +0000 (11:52 +0000)]
Reserve 2 new numbers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861334 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 14 Jun 2019 11:46:18 +0000 (11:46 +0000)]
Follow up to r1847232.
There is no point to use "old" numbers in recent commit.
Also avoid number duplication. The messages are the same but in different code path, so having different numbers makes sense.
This also avoids a warning when running:
make update-log-msg-tags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861333 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 14 Jun 2019 11:42:12 +0000 (11:42 +0000)]
Reserve new numbers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861332 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 13 Jun 2019 19:49:10 +0000 (19:49 +0000)]
Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861294 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 13 Jun 2019 15:34:28 +0000 (15:34 +0000)]
* modules/ssl/ssl_engine_config.c (ssl_cmd_check_file):
If dumping the config, don't validate the paths. Allows
e.g. "httpd -L" to work w/ certs configured but not present,
doesn't affect "httpd -t".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1861269 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 10 Jun 2019 23:00:14 +0000 (23:00 +0000)]
rebuild site map
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860991 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 10 Jun 2019 22:19:19 +0000 (22:19 +0000)]
updated ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860989 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 10 Jun 2019 22:16:22 +0000 (22:16 +0000)]
Updating to match commit EN revision 185570
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860988 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 10 Jun 2019 22:16:00 +0000 (22:16 +0000)]
Updating to match commit EN revision 185570
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860987 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 10 Jun 2019 19:42:16 +0000 (19:42 +0000)]
added the ISGR https://www.abetterinternet.org/ url
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860977 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 28 May 2019 12:52:37 +0000 (12:52 +0000)]
* modules/http2: more copying of data to disentangle worker processing from main connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860260 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 28 May 2019 12:42:17 +0000 (12:42 +0000)]
* modules/http2: reverting r1859724, as no good.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1860257 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 May 2019 14:29:10 +0000 (14:29 +0000)]
Addendum to r1856493: check NULLness of new arg parameter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859791 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 May 2019 13:41:36 +0000 (13:41 +0000)]
*) mod_http2: internal code cleanups and simplifications. Common output code for
h2 and h2c protocols, using nested mutex locks for simplified calls. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859724 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 22 May 2019 09:54:05 +0000 (09:54 +0000)]
* Fix the logic to follow the comment. So far we only forwarded the header if
we have NOT used it AND the env variable was set. But if we have not
used it we should forward it in any case independent of the env variable
setting.
This aligns also with the behaviour in ap_proxy_create_hdrbrgd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859713 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 May 2019 12:12:11 +0000 (12:12 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859467 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 May 2019 12:11:14 +0000 (12:11 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859466 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 17 May 2019 08:42:17 +0000 (08:42 +0000)]
Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.
This function now now handles SSL reuse as well as the "proxy-request-hostname"
note (SNI), so let's also call it unconditionnaly in all proxy modules.
On the mod_ssl side, since this note has the lifetime of the connection, don't
reset/unset it during handshake (ssl_io_filter_handshake).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859422 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 12:52:29 +0000 (12:52 +0000)]
mod_proxy/ssl: Proxy SSL client certificate
configuration and other proxy SSL configurations
broken inside <Proxy> context.
PR 63430
Triggered by r1855646+r1855748.
Patch from rpluem (proxy) and ylavic (ssl).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859371 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 14 May 2019 15:26:08 +0000 (15:26 +0000)]
Arrange balancer_handler() to be able to call
balancer_process_balancer_worker() to create/enable/disable
workers from another modules via a provider.
No functional changes in this first commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859235 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 14 May 2019 08:07:23 +0000 (08:07 +0000)]
* Only do one retry to be more in line with the other modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859213 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 11 May 2019 05:45:02 +0000 (05:45 +0000)]
Axe some outdated compatibility notes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859106 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 9 May 2019 20:07:12 +0000 (20:07 +0000)]
Fix a typo spotted by Ioannis Cherouvim (PR 63414)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1859038 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 May 2019 09:51:48 +0000 (09:51 +0000)]
The bump in r1855311 looks slighly optimistic.
March, 12th should be enough
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1858661 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 May 2019 09:07:32 +0000 (09:07 +0000)]
* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe
error better for anon shm failure case, fixing gcc 9 warning on
passing NULL for '%s'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1858565 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Apr 2019 13:14:56 +0000 (13:14 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1858272 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Apr 2019 13:13:46 +0000 (13:13 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1858271 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 24 Apr 2019 20:22:54 +0000 (20:22 +0000)]
revert r1857857.
The comment is useful and the dead-code is future proof (and should be axed by the compiler anyway)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1858070 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Apr 2019 07:21:03 +0000 (07:21 +0000)]
Fix a compilation error when GPROF is defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857859 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Apr 2019 07:01:29 +0000 (07:01 +0000)]
Axe a useless comment.
Remove some dead code and innacurate comment. 'r' can not be dereferenced later in the function. (this is obvious since r1814659)
(Reverted in r1858070)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857857 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 18 Apr 2019 10:25:33 +0000 (10:25 +0000)]
Fix use of StateDir directive after r1852982:
* server/core.c (reset_config): Rename from reset_config_defines;
tie core_state_dir to pconf lifetime in this cleanup.
(core_pre_config): Adjust accordingly.
* modules/md/mod_md_config.c (md_config_post_config): Pick up base_dir
from statedir in post-config phase so StateDir can influence it.
* modules/dav/fs/mod_dav_fs.c (dav_fs_create_server_config): Don't
init lockdb_path here. (dav_fs_post_config): New function; set
lockdb_path based on configured statedir.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857731 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 16 Apr 2019 08:13:46 +0000 (08:13 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857629 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 16 Apr 2019 07:54:27 +0000 (07:54 +0000)]
Add security note on CoreDumpDirectory for Linux.
Reviewed by: icing, elukey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857626 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 14 Apr 2019 13:21:08 +0000 (13:21 +0000)]
Fix wrong use of ap_rputs with formats.
Use ap_rprintf instead.
It seems noone has PIPE_BUF defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857515 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Apr 2019 18:52:00 +0000 (18:52 +0000)]
Follow up to r1857129: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857130 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Apr 2019 18:46:12 +0000 (18:46 +0000)]
mod_reqtimeout: fix default_[stage]_rate_factor initializations.
r1853901 lowercased the [stage] for MRT_DEFAULT_[stage]_* macros but missed
to change the ones used in reqtimeout_hooks() to initialize the default rate
factors, leading to no default rate in 2.4.39. Fix that now. PR 63325.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1857129 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 10:04:52 +0000 (10:04 +0000)]
Removing no longer existing h2 source file from cmake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856910 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 2 Apr 2019 21:37:27 +0000 (21:37 +0000)]
Well, our build with latest APR trunk seems to insist on updating apr_common.m4
So be it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856846 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 Apr 2019 15:00:43 +0000 (15:00 +0000)]
Fix for: [Bug 62372] Load balancer byrequests required when bytraffic chosen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856829 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 1 Apr 2019 14:29:14 +0000 (14:29 +0000)]
PR63305: fix graceful restart crashes in LDAP
The cache destruction was not protected by the lock used by other
cache callers.
Pull the static cleanup function into util_ldap.c so it's convenient to
use the existing locking.
Submitted By: Martin Fúsek <mfusek newps.cz>
Commited By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856735 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Mar 2019 15:35:12 +0000 (15:35 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856633 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Mar 2019 15:33:49 +0000 (15:33 +0000)]
XML files fr doc updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856632 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 29 Mar 2019 17:37:38 +0000 (17:37 +0000)]
Revert r1856560: was not the latest apr_common.m4 version anyway...
How does that change came in my local workspace in the first place??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856561 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 29 Mar 2019 17:33:23 +0000 (17:33 +0000)]
Update apr_common.m4 to latest (trunk).
Note: why is that file in the httpd repo??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856560 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 28 Mar 2019 22:39:31 +0000 (22:39 +0000)]
mod_cache: follow up to r1856493: cache_strqtok() to reject quoted tokens.
Use a real state machine to track where quotes are allowed, and for
better clarity too...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856507 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 28 Mar 2019 18:22:23 +0000 (18:22 +0000)]
mod_cache: follow up to r1856493: always terminate cache_strqtok() returns.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856500 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 28 Mar 2019 16:39:39 +0000 (16:39 +0000)]
mod_cache: Fix parsing of quoted Cache-Control token arguments. PR 63288.
Make cache_strqtok() return both the token and its unquoted argument (if any),
or an error if the parsing fails.
Cache-Control integer values (max-age, max-stale, ...) can then be parsed w/o
taking care of the (optional) quoting.
Suggested by: fielding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856493 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 28 Mar 2019 16:27:26 +0000 (16:27 +0000)]
Follow up to r1856490: missing one mod_log_forensic test_char_table case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856491 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 28 Mar 2019 16:24:30 +0000 (16:24 +0000)]
Provide TEST_CHAR marco in test_char.h
For (internal) usage outside server/util.c, mod_log_forensic for now
and mod_cache (T_HTTP_TOKEN_STOP) in a few...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856490 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 26 Mar 2019 15:52:28 +0000 (15:52 +0000)]
add loadmodule line to sochache_redis to httpd.conf in Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856322 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 26 Mar 2019 10:57:51 +0000 (10:57 +0000)]
*) mod_md: Store permissions are enforced on file creation, enforcing restrictions in
spite of umask. Fixes <https://github.com/icing/mod_md/issues/117>. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856297 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 22 Mar 2019 09:53:29 +0000 (09:53 +0000)]
mod_proxy: follow up to r1836588: configurable Proxy100Continue.
Add Proxy100Continue directive to allow for 100-continue forwarding opt-out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1856036 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 19 Mar 2019 17:26:38 +0000 (17:26 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Correctly
restore SSL verify state after PHA failure in TLSv1.3.
Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855849 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Mar 2019 16:05:04 +0000 (16:05 +0000)]
*) mod_md: Explicitly setting file permissions to break out of umasks. We want our
non-privilegded apache user to be able to read them. See github issue
<https://github.com/icing/mod_md/issues/117>. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855777 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Mar 2019 13:45:36 +0000 (13:45 +0000)]
rephrase MimeOptions description
rephrase to account for e.g. AddHandler which isn't about response metadata.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855767 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Mar 2019 12:25:48 +0000 (12:25 +0000)]
remove null check
fails in maintainer mode w/ __attribute__(nonnull))
util.c:576:10: error: nonnull parameter 'name' will evaluate to 'true'
on first encounter [-Werror,-Wpointer-bool-conversion]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855755 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 10:18:55 +0000 (10:18 +0000)]
* Solve a chicken and egg problem here:
We need to have sslconn->dc set correctly when we want to
init sslconn, but we need to allocate memory for it first.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855748 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 09:21:26 +0000 (09:21 +0000)]
* r->parsed_uri.path can be NULL in case of the CONNECT method.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855744 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 09:19:54 +0000 (09:19 +0000)]
* Play safe in case we get no name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855743 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 09:17:50 +0000 (09:17 +0000)]
* Revert r1855741 which committed other stuff as well.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855742 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 09:16:06 +0000 (09:16 +0000)]
* Play safe in case we get no name
Reverted by r1855742.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855741 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 17 Mar 2019 14:41:10 +0000 (14:41 +0000)]
Merge consecutive slashes in the URL by default
opt-out w/ `MergeSlashes OFF`.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855705 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Mar 2019 14:13:11 +0000 (14:13 +0000)]
Update compatibility notes for mod_socache_redis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855701 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Mar 2019 18:15:23 +0000 (18:15 +0000)]
allow mod_mime to be de disabled per-dir too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855663 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Mar 2019 14:53:52 +0000 (14:53 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855656 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Mar 2019 14:52:27 +0000 (14:52 +0000)]
xml fr doc updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855655 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Mar 2019 14:49:35 +0000 (14:49 +0000)]
XML tags reordering.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855654 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 16 Mar 2019 13:45:17 +0000 (13:45 +0000)]
mod_proxy/ssl: cleanup per-request SSL configuration for recycled proxy conns.
The SSL dir config of proxy/backend connections is stored in r->per_dir_config
but those connections have a lifetime independent of the requests they handle.
So we need to allow the external ssl_engine_set() function to reset mod_ssl's
dir config in between proxy requests, or the first sslconn->dc could be used
after free for the next requests.
mod_proxy can then reset/reinit the request config when recycling its backend
connections.
PR 63256.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855646 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Mar 2019 20:38:45 +0000 (20:38 +0000)]
Fix some HTML syntax issues.
PR 63095 (Masahiro IMABAYASHI, <masahiro.imabayashi sony.com>)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855614 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 14 Mar 2019 13:39:21 +0000 (13:39 +0000)]
Uplift of relevante changes of r1855479 in branches/2.4.x, re disappearance of h2_ngn_shed.* sources.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855519 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 Mar 2019 20:00:29 +0000 (20:00 +0000)]
spotted by Ruediger
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855455 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 Mar 2019 19:59:47 +0000 (19:59 +0000)]
wrong hat
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855454 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 Mar 2019 18:41:30 +0000 (18:41 +0000)]
mod_mime: Add `MimeOptions`
mod_mime: Add `MimeOptions` directive to allow Content-Type or all metadata
detection to use only the last (right-most) file extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855449 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 Mar 2019 17:56:36 +0000 (17:56 +0000)]
Make the work-around for C++ style comments causing fatal errors in
maintainer-mode for later versions of clang module compile specific
(we will still SEE the errors though when buidlin)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855446 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 13 Mar 2019 15:02:52 +0000 (15:02 +0000)]
update after backport, mod_http2/proxy_http2 now equivalent
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855433 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 Mar 2019 13:13:05 +0000 (13:13 +0000)]
Update mod_reqtimeout 'handshake' compatibility version (r1855413 did it for 2.4.x already).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855418 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 13 Mar 2019 12:45:39 +0000 (12:45 +0000)]
Reverting the unwanted revert of r1852989.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855411 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 12 Mar 2019 23:51:46 +0000 (23:51 +0000)]
fixing bugreport 63258 on the typo mapfile.map.pag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855354 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 12 Mar 2019 21:48:19 +0000 (21:48 +0000)]
mod_ssl: AH10129 from ERR to DEBUG level.
No error here, just debug information.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855349 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 12 Mar 2019 11:43:49 +0000 (11:43 +0000)]
Follow up to r1855306: Axe bucket number from struct process_score.
Implies a Major bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855311 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 12 Mar 2019 10:45:02 +0000 (10:45 +0000)]
MPMs unix: bind the bucket number of each child to its slot number
We need not remember each child's bucket number in SHM for restarts, for the
lifetime of the httpd main process the bucket number can be bound to the slot
number such that: bucket = slot % num_buckets.
This both simplifies the logic and helps children maintenance per bucket in
threaded MPMs, where previously perform_idle_server_maintenance() could create
or kill children processes for the buckets it was not in charge of.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855306 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 12 Mar 2019 09:21:17 +0000 (09:21 +0000)]
*) mod_http2: when SSL renegotiation is inhibited and a 403 ErrorDocument is
in play, the proper HTTP/2 stream reset did not trigger with H2_ERR_HTTP_1_1_REQUIRED.
Fixed. [Michael Kaufmann]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855295 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Mar 2019 14:08:23 +0000 (14:08 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855114 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 Mar 2019 14:06:52 +0000 (14:06 +0000)]
fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1855113 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 7 Mar 2019 10:18:14 +0000 (10:18 +0000)]
Adding new H2Padding directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1854964 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 7 Mar 2019 09:41:15 +0000 (09:41 +0000)]
*) mod_http2: new configuration directive: ```H2Padding numbits``` to control
padding of HTTP/2 payload frames. 'numbits' is a number from 0-8,
controlling the range of padding bytes added to a frame. The actual number
added is chosen randomly per frame. This applies to HEADERS, DATA and PUSH_PROMISE
frames equally. The default continues to be 0, e.g. no padding. [Stefan Eissing]
*) mod_http2: ripping out all the h2_req_engine internal features now that mod_proxy_http2
has no more need for it. Optional functions are still declared but no longer implemented.
While previous mod_proxy_http2 will work with this, it is recommeneded to run the matching
versions of both modules. [Stefan Eissing]
*) mod_proxy_http2: changed mod_proxy_http2 implementation and fixed several bugs which
resolve PR63170. The proxy module does now a single h2 request on the (reused)
connection and returns. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1854963 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 3 Mar 2019 07:26:10 +0000 (07:26 +0000)]
Fix a parsing error when using Ant 1.9.13 without the external Xerces (2.9.0) and Xalan (2.7.1).
The error is: "filter-expr(funcall(current, []), [pred(=(step("attribute", 39), literal-expr(section)))])'. Cause: Erreur lors de la vérification du type de l'expression 'filter-expr(funcall(current, []), [pred(=(step("attribute", 39), literal-expr(section)))])"
This takes us 1 step closer to use Ant 1.9+ and remove Xerces and Xalan from the build chain.
Patch tested with the current doc build chain (Ant 1.6.5 + Xerces + Xalan) on the 2.4.x branch.
Even if actually we don't have any "<Foo>" and "Foo" directives, I've checked that the doc is built correctly in such a case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1854677 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Feb 2019 17:35:18 +0000 (17:35 +0000)]
Simplify charset handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1854409 13f79535 -47bb-0310-9956-
ffa450edef68