- May 26, 2018
-
-
Christophe Jaillet authored
This can not be a runtime ixsue, because, in such a case, we would assert and abort before. PR 59819. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832317 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
If several directories are given in a UserDir directive, only files in the first existing one are checked. If the file is not found there, the other possible directories are not checked. The doc clearly states that they will be checked one by one, until a match is found or an external redirect is performed. PR 59636. While at it, add some debug messages to better understand what is performed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832306 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
mod_proxy_hcheck: add some hyperlinks, improve syntax highlight, add some missing trailing dot, be more consistent with other modules in the way 'Syntax' lines are displayed git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832294 13f79535-47bb-0310-9956-ffa450edef68
-
- May 25, 2018
-
-
Christophe Jaillet authored
In 'ap_proxy_cookie_reverse_map', iterate over each token of the 'Set-Cookie' header field in order to avoid updating the wrong one. This could happen if the header field has something like 'fakepath=foo;path=bar". In this case fakepath would be updated instead of path. We don't need regex anymore in order to parse the field values and 'ap_proxy_strmatch_domain' and 'ap_proxy_strmatch_path' are now useless. (and should be axed IMHO) PR 61560 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832280 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832277 13f79535-47bb-0310-9956-ffa450edef68
-
- May 24, 2018
-
-
Christophe Jaillet authored
See PR 60086. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832202 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
See PR 60086. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832200 13f79535-47bb-0310-9956-ffa450edef68
-
Christophe Jaillet authored
/!\ This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available) See PR 60086. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832198 13f79535-47bb-0310-9956-ffa450edef68
-
- May 23, 2018
-
-
Luca Toscano authored
ap_send_error_response While debugging PR 61860 I found a chain of events that leads to duplicate headers in the HTTP response if Header always set is used in the httpd's config. As far as can understand, mod_headers uses err_headers_out when dealing with the 'always' setting, since it is expected to be preserved even on error. The current code seems to correctly preserve the important headers like Location (happening before the bit of code that changed), but then it swaps headers_out with err_headers_out and clears err_headers_out. My understanding is that this will cause mod_headers, if called again, to re-insert the headers set via 'always' again in err_headers_out, leading to a duplication in the response. So far I managed to reproduce this only with the specific use case outlined by the PR, but there might be more. r1831585 was added to the test suite for PR 61860, (marked as TODO), and now it seems to pass as expected. Since thi...
-
Joe Orton authored
actually done? git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832078 13f79535-47bb-0310-9956-ffa450edef68
-
- May 22, 2018
-
-
Joe Orton authored
so repeated "make check" still works. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832013 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
dummy install root at $builddir/check. * Makefile.in (check-binaries): New target. (check/bin/apxs): Moved target inside check/bin. (check/build/config_vars.mk): Override bindir as well. (check): Use apxs at new location. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832011 13f79535-47bb-0310-9956-ffa450edef68
-
- May 20, 2018
-
-
Yann Ylavic authored
Otherwise, when BalancerPersist is enabled, we might fail (re)starting with a saved slotmem if a BalancerMember was renamed (e.g. PR 62308's port change). This is because the renamed member is considered a new one, while the old name still reserves a slot, so we end up missing one room. The overall number of members does not change so the sizes check succeeds thus the persisted slotmem is not invalidated. Yet the slomem is not really compatible. By clearing inuse flags, we still allow for slots to be reused if their index did not change (thanks to ap_proxy_find_balancershm() and slotmem_fgrab() at the given index), but will also invalidate renamed slots which don't match the index. We now have the correct behaviour by slot and the server (re)starts in any case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831938 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831935 13f79535-47bb-0310-9956-ffa450edef68
-
- May 19, 2018
-
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831898 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831897 13f79535-47bb-0310-9956-ffa450edef68
-
- May 18, 2018
-
-
Yann Ylavic authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831872 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
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 authored
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 authored
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 authored
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
-
- May 17, 2018
-
-
William A. Rowe Jr authored
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 authored
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 authored
... 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
-
- May 14, 2018
-
-
Christophe Jaillet authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831591 13f79535-47bb-0310-9956-ffa450edef68
-
- May 11, 2018
-
-
Yann Ylavic authored
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 authored
The caller might (and actually balancer_child_init() does) rely on slotmem_attach() to not mangle the passed in/out slotmem pointer on failure. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831394 13f79535-47bb-0310-9956-ffa450edef68
-
- May 09, 2018
-
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831231 13f79535-47bb-0310-9956-ffa450edef68
-
Stefan Eissing authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831230 13f79535-47bb-0310-9956-ffa450edef68
-
Yann Ylavic authored
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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831218 13f79535-47bb-0310-9956-ffa450edef68
-
- May 08, 2018
-
-
Joe Orton authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831175 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831174 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
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 authored
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 authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831171 13f79535-47bb-0310-9956-ffa450edef68
-
Joe Orton authored
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 authored
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
-
- May 06, 2018
-
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831032 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831031 13f79535-47bb-0310-9956-ffa450edef68
-
Lucien Gentis authored
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831030 13f79535-47bb-0310-9956-ffa450edef68
-