]>
granicus.if.org Git - apache/log
Lucien Gentis [Sat, 19 May 2018 15:19:20 +0000 (15:19 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831898 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 May 2018 15:18:22 +0000 (15:18 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831897 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 May 2018 17:18:19 +0000 (17:18 +0000)]
Follow up to r1831869: update CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831872 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 May 2018 17:05:18 +0000 (17:05 +0000)]
mod_slotmem_shm: follow up to r1831869 (check persistent files).
Since persistent files are also reused on stop/start, we must ensure that
they match the same descriptor when reused on the next startup, so add it
to integrity metadata.
Also, the descriptor being the first field in the SHM, we don't need to
copy on the stack it in several places, and can handle it as a pointer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831871 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 May 2018 16:48:34 +0000 (16:48 +0000)]
mod_slotmem_shm: follow up to r1831869.
Don't try to attach SHMs on startup, they might be from a previous crash and
prevent the server to start (on failure to reuse it).
On mpm_winnt though, the pre/post_config() phases are re-run in child process,
and the parent process already created the SMs, so they must be attached there.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831870 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 May 2018 16:33:28 +0000 (16:33 +0000)]
mod_slotmem_shm: use a generation number for SHM filename on all platforms.
Successive generations can't share the same SHMs because restarts may modify
them under the terminating children, while SHMs are not extensible when all
slots are in use.
This effectively restores r1822341 which was reverted by r1822505.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831869 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 May 2018 16:22:21 +0000 (16:22 +0000)]
Restore mod_slotmem_shm from 2.4.29.
Will restart from there to really fix PR 62308 (and PR 62044 still).
This effectively reverts:
- r1831394,
- r1830800,
- r1826970,
- r1826845,
- r1823572,
- r1823416,
- r1823415,
- r1823412,
- r1822511,
- r1822509.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831868 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 17 May 2018 17:47:56 +0000 (17:47 +0000)]
Error page translations submitted for zh-cn and zh-tw, contributed
by CodeingBoy <codeingboy gmail.com>.
Note that zh-tw is not a native translation; each translation aught
be reviewed by a native reader before backporting to 2.4.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831800 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 17 May 2018 12:28:59 +0000 (12:28 +0000)]
PR62311: only create the rewritelock when needed
Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831773 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 17 May 2018 12:21:15 +0000 (12:21 +0000)]
PR62368: Print the unparsed URI in AH03454
... to include r->args and get otherwise get as close to possible to
what came in over the wire.
Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831772 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 14 May 2018 20:51:31 +0000 (20:51 +0000)]
I don't know if 'c' can be NULL here, but we should not dereference it before checking.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831591 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 11 May 2018 09:44:38 +0000 (09:44 +0000)]
Revert r1831218, the API garantees slotmem_attach() is called in child_init().
r1831394 is the right follow to r1830800 to preserve "inherited" slotmems in
children processes.
While at it, comment on the expectations from mod_proxy_balancer w.r.t.
slotmem_attach() implementations, and eventually how we could improve the API
later (w/o backporting to 2.4.x).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831396 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 11 May 2018 09:31:13 +0000 (09:31 +0000)]
mod_slotmem_shm: follow up to r1830800, preserve callee API.
The caller might (and actually balancer_child_init() does) rely on
slotmem_attach() to not mangle the passed in/out slotmem pointer on
failure.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831394 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 9 May 2018 07:33:20 +0000 (07:33 +0000)]
* mod_http2: fix by notroj to silence gcc strncpy warnings and simplify
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831231 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 9 May 2018 07:29:26 +0000 (07:29 +0000)]
http2 version step
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831230 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 May 2018 01:23:59 +0000 (01:23 +0000)]
mod_proxy_balancer: follow up to r1830800.
Don't call slotmem_attach() if the slot is already initialized/reused, that
used to work previously because the returned error status is ignored, but
r1830800 changed the function to forcibly reset the returned slot pointer to
NULL first.
There is no point to call slotmem_attach() in this case, the slot is already
initialized because it's either inherited/fork()ed on Unixes, or on Windows
the attachment happened in post_config/slotmem_create() already.
One case where slotmem_attach() would fail is when balancers are defined
globally (main server) and some virtualhosts don't have/use any mod_proxy
configuration/directive. In this case their proxy server config is a pointer
copy of the main server thus their slots are already initialized in both
post_config and child_init hooks. While the case was already handled in
the balancer_post_config(), it did not in balancer_child_init() where we
relied on slotmem_attach() to be a noop.
[Reverted by r1831396]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831218 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 May 2018 12:51:38 +0000 (12:51 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831175 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 May 2018 12:51:05 +0000 (12:51 +0000)]
Add next-number bump missed in r1831173.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831174 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 May 2018 12:50:26 +0000 (12:50 +0000)]
* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Add error
logno. Free EVP_PKEY in engine case. Never try reading ECDH/DH
parameters from engine ids.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831173 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 8 May 2018 12:48:13 +0000 (12:48 +0000)]
fix bld break in r1831165
I had to disable -Werror in maintainer mode for this file in darwin :/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831172 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 8 May 2018 12:46:44 +0000 (12:46 +0000)]
style fix for r1831165
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831171 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 8 May 2018 12:39:22 +0000 (12:39 +0000)]
mod_ssl: Add support for loading TLS certificates through the PKCS#11
engine.
* modules/ssl/ssl_util.c (modssl_is_engine_id): Renamed
from modssl_is_engine_key.
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
Adjust accordingly.
(ssl_cmd_SSLCertificateFile): Also allow ENGINE cert ids.
* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
Rename from modssl_load_engine_key; load certificate if
cert id is passed.
* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Optionally
load the certificate from the engine as well.
* docs/manual/: Update manual.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831168 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 8 May 2018 12:31:02 +0000 (12:31 +0000)]
mod_ldap: log and abort locking errors.
related to PR60296 investigation
RMM corruption is really nasty, so abort on locking failures.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831165 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 6 May 2018 16:32:44 +0000 (16:32 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831032 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 6 May 2018 16:31:53 +0000 (16:31 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831031 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 6 May 2018 16:17:49 +0000 (16:17 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831030 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 6 May 2018 16:16:16 +0000 (16:16 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1831029 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 4 May 2018 19:54:53 +0000 (19:54 +0000)]
Save a few cycles.
Use apr_pstrmemdup instead of apr_pstrndup when possible.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830944 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 4 May 2018 19:51:12 +0000 (19:51 +0000)]
Save a few cycles and simlify code.
Use apr_pstrmemdup instead of apr_pstrndup when possible.
Avoid scanning the first 2 bytes when looking for the | delimiter. it is known to be "${".
Avoid comma separated statements, it is not that usual.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830943 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 4 May 2018 17:56:32 +0000 (17:56 +0000)]
Simplify the ssl_asn1_table API, remove abstraction (it is used only
to cache serialized EVP_PKEYs not any char * blobs), and document.
* modules/ssl/ssl_util.c (ssl_asn1_table_set): Take the EVP_PKEY and
serialize internally. Use ap_realloc. Return the ssl_asn1_t *
pointer. Don't call apr_hash_set() for unchanged pointer case.
* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):
Adjust for the above.
* modules/ssl/ssl_private.h: Adjust as above, add docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830927 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 4 May 2018 12:24:11 +0000 (12:24 +0000)]
* modules/ssl/ssl_util_ssl.c (modssl_read_privatekey): Remove unused
second argument.
* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Adjust
accordingly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830913 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 4 May 2018 12:16:37 +0000 (12:16 +0000)]
* modules/ssl/ssl_util_ssl.c, modules/ssl/ssl_util_ssl.h:
Remove modssl_read_encrypted_pkey() and helpers, added in r1804087
but never used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830912 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 4 May 2018 07:09:47 +0000 (07:09 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830880 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 4 May 2018 07:09:28 +0000 (07:09 +0000)]
Use <var> for variables in directive syntax everywhere for
consistency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830879 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 3 May 2018 16:11:41 +0000 (16:11 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830840 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 3 May 2018 15:41:26 +0000 (15:41 +0000)]
* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):
Simplify code, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830836 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 3 May 2018 13:06:46 +0000 (13:06 +0000)]
mod_ssl: Add support for loading private keys from ENGINEs. Support
for PKCS#11 URIs only, and PIN entry is not threaded through
SSLPassPhraseDialog config yet.
* modules/ssl/ssl_util.c (modssl_is_engine_key): New function.
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
Use it, skip check for file existence for engine keys.
* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_pkey):
New function.
* modules/ssl/ssl_engine_init.c (ssl_init_server_certs):
For engine keys, load via modssl_load_engine_pkey.
Submitted by: Anderson Sasaki <ansasaki redhat.com>, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830819 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 3 May 2018 12:25:32 +0000 (12:25 +0000)]
* modules/ssl: Add some missing logno tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830816 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 3 May 2018 08:32:42 +0000 (08:32 +0000)]
mod_slomem_shm: Handle a generation number when the slotmem size changes.
Modifying the number of proxy balancers or balancer members on restart
could have prevented the server to load, notably on Windows. PR 62308.
The generation number integrated in the SHM filename allows to create a
new/resized SHM while the previous is still in use by previous generation
gracefully shutting down (Windows prevents SHM/file to be removed in this
case, but even on Unix(es) an unlinked file might not be re-openable while
an inode exists). The generation number is added/incremented only if the
size requirement changed, such that unrelated restarts continue to share
SHMs between generations.
The cleanup handling is also simplified because both the parent process and
the Windows child process need to cleanup everything on exit. This translates
to cleanup_slotmem() being always registered but in the dry load state
(AP_SQ_MS_CREATE_PRE_CONFIG), for both cases still.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830800 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 2 May 2018 13:15:50 +0000 (13:15 +0000)]
* build/config_vars.sh.in: Clean more variables from installed
config_vars.mk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830754 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 2 May 2018 12:30:09 +0000 (12:30 +0000)]
* modules/md/config2.m4: Only export "md_module" symbol
for a DSO build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830747 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 2 May 2018 11:32:22 +0000 (11:32 +0000)]
mod_proxy_html: Fix variable interpolation and memory allocation failure in ProxyHTMLURLMap.
Proposed by: Ewald Dieterich <ewald mailbox.org>
Reviewed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830746 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 2 May 2018 11:16:00 +0000 (11:16 +0000)]
Follow up to r1822537: replace static variable with pool userdata.
Also adds a comment and a CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830744 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 30 Apr 2018 12:46:50 +0000 (12:46 +0000)]
On the trunk:
mod_http2: restoring the v1.10.16 keepalive timeout behavioud of mod_http2 (to be verified).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830562 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 30 Apr 2018 07:42:13 +0000 (07:42 +0000)]
On the trunk:
mod_http2: adding an abort function to slave connections' pools, so out-of-memory
events lead to a control process abort, as on HTTP/1.x connections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830534 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 29 Apr 2018 22:11:04 +0000 (22:11 +0000)]
mod_xml2enc: follow up to r1829038 and r1829039.
Use below pending_data logic for EOS bucket.
This closes #48
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830523 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 29 Apr 2018 22:07:26 +0000 (22:07 +0000)]
Follow up to r1828222: fix "defined but not used 'prot'" warning with libressl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830522 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 29 Apr 2018 06:02:28 +0000 (06:02 +0000)]
Add mod_socache_redis docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830490 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 29 Apr 2018 05:58:52 +0000 (05:58 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830489 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 28 Apr 2018 12:13:00 +0000 (12:13 +0000)]
mod_proxy_http2 docs: added section about HTTP/2 PUSH implementation and alternatives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830443 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 28 Apr 2018 11:58:24 +0000 (11:58 +0000)]
trivial tweak
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830439 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 28 Apr 2018 11:09:09 +0000 (11:09 +0000)]
mod_http2 documentation: going a bit more into PUSH details and explaining H2EarlyHints feature.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830428 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 28 Apr 2018 09:41:01 +0000 (09:41 +0000)]
On the trunk:
mod_http2: adding regular memory cleanup when transferring large response bodies. This
reduces memory footprint and avoids memory exhaustion when transferring large files
on 32-bit architectures. Fixes PR 62325.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830419 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 28 Apr 2018 09:28:23 +0000 (09:28 +0000)]
mod_log_json: fixing compilation errors in maintainer mode.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1830417 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 23 Apr 2018 15:49:16 +0000 (15:49 +0000)]
Add mod_log_json
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829898 13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 23 Apr 2018 15:31:28 +0000 (15:31 +0000)]
Move APACHE_CHECK_JANSSON m4 macro to general includes so additional modules can use it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829895 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 Apr 2018 19:36:41 +0000 (19:36 +0000)]
Save a few cycles.
We already know the length of the string we want to copy, so use 'apr_pstrmemdup()' instead of 'apr_strdup()'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829799 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 22 Apr 2018 15:58:18 +0000 (15:58 +0000)]
Axe ap_rgetline_core(), not used anymore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829790 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 22 Apr 2018 15:48:31 +0000 (15:48 +0000)]
Follow up to r1829659, ap_[f]getline() EBCDIC awareness.
Rename ap_fgetline_impl() to ap_fgetline_core(), and do missing EBCDIC
translation in ap_fgetline().
Also restore EBCDIC translation for ap_getline(), as noted by Ruediger this
was changed (unexpectedly) in r1829659.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829789 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Apr 2018 16:28:53 +0000 (16:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829725 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Apr 2018 16:24:52 +0000 (16:24 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829722 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Apr 2018 16:19:21 +0000 (16:19 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829720 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Apr 2018 15:59:44 +0000 (15:59 +0000)]
rebuild with extraclean to pick up permalinks in
This will make it easier to compare with an extraclean jdk9
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829716 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Apr 2018 15:45:59 +0000 (15:45 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829715 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Apr 2018 15:43:20 +0000 (15:43 +0000)]
xforms for mod_filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829714 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Apr 2018 15:42:03 +0000 (15:42 +0000)]
try to make the mod_filter docs a little more approachable
- more consistently refer to the filters declared via the harness as
"smart filters"
- reinforce that the providers are traditional filters.
- drop some info about the optional type parameter
- elaborate on examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829713 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 20 Apr 2018 21:06:39 +0000 (21:06 +0000)]
Improve highlight and make these doc much more readable.
Use the "c" highlight for API description.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829678 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 20 Apr 2018 19:33:51 +0000 (19:33 +0000)]
Delay some memory allocation.
If this handler will not handle the request, no need to waste bytes in the request pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829676 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 14:30:19 +0000 (14:30 +0000)]
http: add ap_fgetline() and AP_GETLINE_NONBLOCK flag.
It allows to read a line directly from an input filter, in blocking mode
or not. Since no request_rec is needed, a pool may be given.
Existing ap_[r]getline() function are now based off ap_fgetline() by calling:
ap_fgetline(s, n, read, r->proto_input_filters, flags, bb, r->pool);
Will follow up with a new ap_get_mime_headers_*() flavor which can be used by
any filter that needs non-blocking and not necessarily has a request_rec (e.g.
ap_http_filter() to read proxied response trailers).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829659 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 13:55:43 +0000 (13:55 +0000)]
mod_proxy_http: follow up to r1829573: remain EBCDIC friendly.
Keep using ap_rgetline() as before r1829573, since ap_rgetline_core() is
EBCDIC agnostic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829657 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 11:07:23 +0000 (11:07 +0000)]
core: forward flags to recursive/folding call to ap_rgetline_core().
We still need them when folding, other than AP_GETLINE_FOLD itself of course.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829645 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 10:38:05 +0000 (10:38 +0000)]
Restore comment about LimitRequestBody vs proxied responses.
ResponseFieldSize actually applies to headers (not body), so the comment was
valid but did match the code (addressed by r1829642 still).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829643 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Apr 2018 09:46:51 +0000 (09:46 +0000)]
http: LimitRequestBody applies to proxied requests.
If f->r->proxyreq is PROXYREQ_PROXY or PROXYREQ_REVERSE in ap_http_filter(),
we are still handling the request, not the response where LimitRequestBody
does not apply.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829642 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 19 Apr 2018 20:25:35 +0000 (20:25 +0000)]
Fix some formating. (extra '.', missing <code>)
Fix the number of available load balancer scheduler algorithms and add a link to the corresponding module. (lbmethod_heartbeat was missing in the list)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829613 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Apr 2018 16:06:57 +0000 (16:06 +0000)]
mod_proxy_http: make use of AP_GETLINE_NOSPC_EOL in ap_proxygetline().
Fixes response header thrown away after the previous one was considered too
large and truncated.
PR 62196.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829573 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Apr 2018 15:01:10 +0000 (15:01 +0000)]
core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().
This tells the ap_getline() family of functions to consume the end of line
when the buffer is exhausted.
PR 62198.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829557 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 19 Apr 2018 08:02:41 +0000 (08:02 +0000)]
* modules/ssl/ssl_engine_init.c (ssl_init_Module): Don't enable SSL
for a vhost if SSLEnable is not used and no certs are configured,
even if the Listen protocol is "https". Restores behaviour to that
prior to r1809303 for configs which would now otherwise fail at
startup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829513 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 17 Apr 2018 19:58:16 +0000 (19:58 +0000)]
These tokens should not be emphasised.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829393 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 17 Apr 2018 19:33:27 +0000 (19:33 +0000)]
Explain when the surrounding double quotes arround the expr argument MUST be avoided.
Fix an example to add these surrounding quotes to be consistent and in line with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829390 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Apr 2018 17:57:13 +0000 (17:57 +0000)]
Guess at fixing win32 build regression on trunk introduced by r1734656
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829381 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 16 Apr 2018 12:36:42 +0000 (12:36 +0000)]
* modules/ssl/ssl_util.c (modssl_request_is_tls): Adjust
to take SSLConnRec * out parameter rather than SSL *.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Use it here.
(ssl_hook_Fixup): Adjust use.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829263 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 16 Apr 2018 10:14:25 +0000 (10:14 +0000)]
Factor out logic to determine if request is using SSL/TLS and use it
consistently.
* modules/ssl/ssl_util.c (modssl_request_is_tls): New function.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Fixup): Use it.
* modules/ssl/mod_ssl.c (ssl_hook_http_scheme, ssl_hook_default_port):
Use it.
PR: 61519
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829250 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Apr 2018 14:26:29 +0000 (14:26 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829143 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Apr 2018 14:14:51 +0000 (14:14 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829142 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 13 Apr 2018 09:36:01 +0000 (09:36 +0000)]
Dump server_rec ->addrs list in dump_server_rec.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829048 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 13 Apr 2018 08:04:59 +0000 (08:04 +0000)]
mod_xml2enc: follow up to r1829038.
If any, pass pending meta bucket down the chain before leaving.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829039 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 13 Apr 2018 07:58:51 +0000 (07:58 +0000)]
mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.
All meta buckets are now aggregated (besides FLUSH) and forwarded down
the chain, and the output filter bails out on EOS.
Proposed by: Micha Lenk <micha lenk.info>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1829038 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 12 Apr 2018 14:47:38 +0000 (14:47 +0000)]
* server/vhost.c: Remove redundant vhost_check_config hook which never
fails, r1053230 removed all the places where config_error was set.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828983 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Apr 2018 19:18:03 +0000 (19:18 +0000)]
add log id for r1828926
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828927 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Apr 2018 19:11:52 +0000 (19:11 +0000)]
PR62199: add worker parameter ResponseFieldSize to mod_proxy
Submitted By: Hank Ibell
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828926 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Apr 2018 18:49:05 +0000 (18:49 +0000)]
PR62186: preserve %<m for ErrorDocument internal redirects
*) core: Preserve the original HTTP request method in the '%<m' LogFormat
when an path-based ErrorDocument is used. PR 62186.
[Micha Lenk <micha lenk.info>]
Submitted By: Micha Lenk
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828920 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Apr 2018 16:11:21 +0000 (16:11 +0000)]
COMPAT BREAK: This may change the hash keys used to cache privkeys
across a reload so don't backport this to 2.4. Otherwise it's only
user-visible in logging output.
* modules/ssl/ssl_engine_init.c (ssl_init_Module): Derive the vhost_id
*after* potentially setting sc->enabled to default-on, since the
port used may change if not specified explicitly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828913 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Apr 2018 15:58:04 +0000 (15:58 +0000)]
* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,
no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828912 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Apr 2018 15:46:44 +0000 (15:46 +0000)]
* modules/generators/mod_info.c: Constify fixed tables and mark
module-private global variables static. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828909 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Riggs [Wed, 11 Apr 2018 12:11:05 +0000 (12:11 +0000)]
mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are
used as drop-in replacements for unusable workers in the same load balancer set. This differs
from hot standbys which are only used when all workers in a set are unusable. PR 61140.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828890 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 11 Apr 2018 08:30:25 +0000 (08:30 +0000)]
On the trunk:
mod_http2: always wake up any conditional waits when streams are aborted. Fixes race conditions where timeouts would trigger instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828879 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 10 Apr 2018 18:29:58 +0000 (18:29 +0000)]
Update prettify.js
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828843 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 10 Apr 2018 18:19:56 +0000 (18:19 +0000)]
Align the regex with the one used in 2.4.x which gives nicer results.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828841 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 10 Apr 2018 07:09:20 +0000 (07:09 +0000)]
We need to get the SSL_CTX for further processing down below.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828793 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 10 Apr 2018 06:42:39 +0000 (06:42 +0000)]
* Fix copy and paste typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1828792 13f79535 -47bb-0310-9956-
ffa450edef68