]>
granicus.if.org Git - apache/log
Yann Ylavic [Thu, 15 Feb 2018 23:15:16 +0000 (23:15 +0000)]
Follow up to r1821624: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824381 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 18:31:25 +0000 (18:31 +0000)]
mod_cache_socache: Fix caching of empty headers up to carriage return.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824343 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 17:53:24 +0000 (17:53 +0000)]
regex: Allow to configure global/default options for regexes.
Like caseless matching or extended format, which may be useful as default
behaviour the whole configuration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824339 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 17:42:14 +0000 (17:42 +0000)]
mod_authnz_ldap: Fix language long names detection as short name.
Make sure the long name format is relevent before converting it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824336 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 17:21:52 +0000 (17:21 +0000)]
mod_proxy: follow up to r1667707: MMN minor bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824332 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Feb 2018 12:57:14 +0000 (12:57 +0000)]
core: Ensure that ap_*getline*() return NUL terminated lines on any error.
This was done only on buffer full, so be consistent, and fail early if the
given buffer can't even hold the NUL bytes (negative or nul size).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824303 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Feb 2018 22:19:35 +0000 (22:19 +0000)]
Give credit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824272 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Feb 2018 22:15:37 +0000 (22:15 +0000)]
Add CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824270 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 14 Feb 2018 15:39:55 +0000 (15:39 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824251 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 14 Feb 2018 15:30:49 +0000 (15:30 +0000)]
fixing missing rename of SSLPolicy section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824247 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 13 Feb 2018 21:22:05 +0000 (21:22 +0000)]
mod_proxy: Provide an RFC1035 compliant version of the hostname in the
proxy_worker_shared structure. PR62085
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824176 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:54:00 +0000 (14:54 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824146 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:51:33 +0000 (14:51 +0000)]
Fixes quoting as per https://bz.apache.org/bugzilla/show_bug.cgi?id=62063
Credit: Hendrik Harms <hendrik.harms@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824144 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:45:05 +0000 (14:45 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824142 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:34:41 +0000 (14:34 +0000)]
Oops. Mised pre-systemd syntax with systemd syntax. Trying to be consistent. I expect someone will complain.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824141 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:24:53 +0000 (14:24 +0000)]
Adding newly generated .fr docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824140 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 14:22:26 +0000 (14:22 +0000)]
Rebuild from recent changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824139 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Feb 2018 13:51:48 +0000 (13:51 +0000)]
Installation instructions, and links, for the majority of people who
will not be building from source.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824136 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 12 Feb 2018 21:20:20 +0000 (21:20 +0000)]
Fixes weird formatting issue in the output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1824076 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 11 Feb 2018 19:30:40 +0000 (19:30 +0000)]
mod_proxy_fcgi: prioritize the check for mayflush when using flushpackets
The mayflush variable should be checked before the rest
to avoid polling when not needed.
Suggested by Yann Ylavic on the dev@ mailing list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823886 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Sun, 11 Feb 2018 19:21:43 +0000 (19:21 +0000)]
More corrections to mod_ssl Spanish translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823883 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 11 Feb 2018 11:09:35 +0000 (11:09 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823833 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 11 Feb 2018 11:09:15 +0000 (11:09 +0000)]
mod_proxy_fcgi.xml: add more context to the conn reuse note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823832 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 11 Feb 2018 10:41:33 +0000 (10:41 +0000)]
Axe some code duplication.
Use 'ap_array_str_contains()' instead of 'ctutil_in_array()'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823827 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Feb 2018 16:32:19 +0000 (16:32 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823783 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Feb 2018 16:30:41 +0000 (16:30 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823782 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 10 Feb 2018 12:16:07 +0000 (12:16 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823750 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 10 Feb 2018 12:15:36 +0000 (12:15 +0000)]
mod_proxy_fcgi.xml: add a note about connection reuse
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823749 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Feb 2018 16:01:07 +0000 (16:01 +0000)]
Follow up to r1822509: amend CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823575 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Feb 2018 15:42:49 +0000 (15:42 +0000)]
mod_slotmem_shm: follow up tp r1822509.
Fishy "unlink semantic" (description) does not apply anymore.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823572 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Feb 2018 15:08:09 +0000 (15:08 +0000)]
mod_proxy_balancer: follow up tp r1822509.
Rework server_rec ID so that it doesn't change on restart (or stop/start)
unless it's Host(s)/IP(s):port(s), ServerName and/or ServerAlias(es) changed.
The goal being to reuse SHMs (and persisted files) names as much as possible,
with minimal bindings to configuration changes (as far as mod_proxy_balancer
is concerned). So if the ServerName and first Host/IP:port are unique we use
that first, otherwise the ServerAlias(es) and other Host(s)/IP(s):port(s) are
also taken into account, and finally if that's still not enough the server
index is also used (pathological case handled for correctness with regard to
the underlying mod_slotmem_shm's reuse code).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823564 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Feb 2018 15:38:23 +0000 (15:38 +0000)]
too-long worker schemes and/or hostnames are no longer fatal errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823482 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 7 Feb 2018 15:06:49 +0000 (15:06 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823473 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 7 Feb 2018 13:43:38 +0000 (13:43 +0000)]
Correct LDAP quoting. Patch from hendrik.harms@gmail.com
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823463 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 6 Feb 2018 23:43:41 +0000 (23:43 +0000)]
mod_slotmem_shm: follow up tp r1822509.
Complete layout of SHM and persited file (ascii art).
Simplify an "if" condition, no functional change.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823416 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 6 Feb 2018 23:37:25 +0000 (23:37 +0000)]
mod_slotmem_shm: follow up tp r1822509.
Do not bind attached slotmems to the global list, they should be detached with
the given pool (pchild) is cleaned up, but not destroyed/removed (doubly) with
pglobal.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823415 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 6 Feb 2018 23:30:41 +0000 (23:30 +0000)]
mod_slotmem_shm: follow up tp r1822509.
Check SHM sizes when reused, reload may have changed the needs.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823412 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 5 Feb 2018 14:15:54 +0000 (14:15 +0000)]
* config.layout: Add "modern" Fedora (/RHEL) layout; different to
older layout used in "RedHat".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823179 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 3 Feb 2018 18:10:23 +0000 (18:10 +0000)]
mpm_event: move lingering close "sucker" from the listener to worker(s).
This was the last non-constant time action performed by the listener thread.
It's now handled by the worker thread directly after entering lingering close,
which should directly address the cases when the socket is already closed
remotely at that time, hence avoid more scheduling (it may be the common case
for some scenarios).
And it's only if the above would need blocking (i.e. more data to suck) that
the socket is added to the pollset for the listener to re-schedule a worker
later when ready. If no worker is available at that time then the socket is
forcibly closed (similarly to what's done for keepalive connections in this
case).
Also, since process_lingering_close() is now called by a worker thread and
with almost no depth in the call stack, we can grow the size of the "suck"
buffer from 2K to 32K to potentially call recv() up to sixteen times less.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1823047 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Feb 2018 08:35:26 +0000 (08:35 +0000)]
* modules/loggers/mod_logio.c (logio_pre_config): Remove pointless
static in optional fn pointer variable declaration.
* modules/ssl/ssl_engine_vars.c (ssl_var_log_config_register):
Likewise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822931 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Feb 2018 15:41:49 +0000 (15:41 +0000)]
mod_proxy: follow up to r1822849 and r1822879.
Fix my maths, thanks Stefan and RĂ¼diger!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822883 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Feb 2018 15:01:40 +0000 (15:01 +0000)]
mod_proxy: follow up to r1822849 and r1822878.
Does r1822878's "static" APR_RETRIEVE_OPTIONAL_FN work if, say, mod_proxy is
builtin but mod_http2 isn't?
Not worth taking the risk here since it's not a fast path...
Note: if this is an issue, I'm afraid it applies elsewhere too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822879 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Feb 2018 14:42:07 +0000 (14:42 +0000)]
mod_proxy: follow up to r1822849.
Get the help(er) of mod_http2 to determine how much connections should
be handled in the reslist by default (i.e. max_threads).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822878 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Feb 2018 12:37:51 +0000 (12:37 +0000)]
On the trunk:
adding AP_DECLARE for ap_parse_vhost_addrs() and minor bumb mmn. Resolves
building mod_ssl on Windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822872 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Feb 2018 08:34:59 +0000 (08:34 +0000)]
* Add some some comment why we do not limit hmax any longer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822858 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Feb 2018 08:34:54 +0000 (08:34 +0000)]
* Makefile.in (build/config_vars.out): Rebuild if build/config_vars.sh
has changed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822857 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Feb 2018 07:34:02 +0000 (07:34 +0000)]
* When mod_http2 is loaded more then ThreadsPerChild backend connections can
be useful as mod_http2 has an additional thread pool on top of
ThreadsPerChild.
But leave the default with ThreadsPerChild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822849 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 31 Jan 2018 14:25:53 +0000 (14:25 +0000)]
Revert r1822800 and r1822804.
All was already there, I just misread name vs sname :/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822806 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 31 Jan 2018 14:15:03 +0000 (14:15 +0000)]
mod_proxy_balancer: follow up tp r1822509 and r1822800.
Actually we already have an (per vhost) unique id for the balancer, so use it.
[Reverted by r1822806]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822804 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 31 Jan 2018 13:55:53 +0000 (13:55 +0000)]
mod_proxy_balancer: follow up tp r1822509.
Use a unique balancer id per vhost for workers' slotmem too.
[Reverted by r1822806]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822800 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 30 Jan 2018 17:20:21 +0000 (17:20 +0000)]
core: follow up to r1822596.
We can't dereference 'f' after EOR is destroyed either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822666 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jan 2018 10:09:36 +0000 (10:09 +0000)]
On the trunk:
mod_http2: removed obsolete stream detach code, no longer generating events
in beam shutdown on pool destroy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822624 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 30 Jan 2018 02:00:33 +0000 (02:00 +0000)]
core: don't send EOR bucket through request filters.
The core request filter is the only one which should take care of it.
In theory the other request filters should have bailed out on EOS already,
but that's not always the case (and even less the case on error).
So be safe by not sending them a bucket which may destroy the request (and
their brigade) underneath them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822600 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 30 Jan 2018 00:58:54 +0000 (00:58 +0000)]
core: fix ap_request_core_filter()'s brigade lifetime.
The filter should pass everything up to and including EOR, then bail out.
For EOR it can't use a brigade created on r->pool, so retain one created
on c->pool in c->notes (this avoids leaking a brigades for each request
on the same connection).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822596 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jan 2018 17:00:23 +0000 (17:00 +0000)]
mpm_unix(es): cleanup properly on exit in one_process mode.
We can't destroy ap_pglobal in the MPMs because clean_child_exit() runs in
a DSO which would be unloaded under us.
So we defer an ap_terminate() with atexit() in ap_unixd_mpm_set_signals(),
all this is static/builtin code in "os/unix/unixd.c".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822537 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jan 2018 16:52:19 +0000 (16:52 +0000)]
Revert r1814112, it does not work for threaded MPMs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822535 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jan 2018 16:41:03 +0000 (16:41 +0000)]
mod_proxy: fix proxy connection cleanup from an n+2 pool.
When connection_destructor() is called after pchild is gone, we can't
dereference worker->cp anymore. This happens is debug/one_process mode only,
if we exit by calling apr_terminate() or clearing the process pool directly.
Fix this by NULL-ing worker->cp in conn_pool_cleanup(), and by registering it
as a pre_cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822531 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jan 2018 14:43:21 +0000 (14:43 +0000)]
mod_slotmem_shm: follow up tp r1822509.
Please buildbot (and incidentally users of older APR) by using
apr_shm_remove() instead of the new(er) apr_shm_delete().
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822511 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jan 2018 14:34:50 +0000 (14:34 +0000)]
mod_slotmem_shm: Rework SHM reuse/deletion.
To fix races with graceful restarts (PR 62044).
This commit does:
1/ use a constant file name for all systems (no generation suffix which
makes a new SHM to be created for each restart, losing previous data)
2/ maintain the list of the created SHMs accross restarts (ap_pglobal list)
3/ not unlink the files on restart anymore (otherwise we can't reuse them)
4/ not attach existing SHMs in slotmem_create() anymore (not suitable since
those are necessarily crash remainders)
5/ add type/sizes consistency check for persisted slots on restoration
6/ unlink the files only on stop/exit or before creating them (crash recovery)
We could possibly avoid 6/ (since we don't need to re-open files now) if we
remove the file just after the SHM is created. This would at least work for
systems with "unlink semantic" (i.e. unlink succeeds even if some descriptors
are opened, the "real" thing happening when the last one desciptor closed), but
this wouldn't work for other systems so I kept the code generic for now.
[Reverted by r1831868]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822509 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 Jan 2018 13:22:47 +0000 (13:22 +0000)]
Revert r1822341, slotmems are not reused on (graceful) restart.
Will follow up with an alternate fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822505 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 29 Jan 2018 13:10:22 +0000 (13:10 +0000)]
mod_http2/mod_proxy_http2: add new module flags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822503 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 29 Jan 2018 13:03:49 +0000 (13:03 +0000)]
On the trunk:
mod_http2: discourage gzip/brotli content encoding on http2-status responses as
they are inserted into the reponse when filters are already done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822502 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 29 Jan 2018 11:40:25 +0000 (11:40 +0000)]
On the trunk:
core: adding defines to allow interworking with honggfuzz without
further patches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822500 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 27 Jan 2018 02:09:07 +0000 (02:09 +0000)]
mpm_fdqueue: follow up to r1821624.
80 colums.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822367 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 27 Jan 2018 02:01:47 +0000 (02:01 +0000)]
mpm_fdqueue: follow up to r1821624.
Export ap_queue_*() fonctions, so that they are accessible from MPMs, but
don't provide "mpm_fdqueue.h" in the API (include/).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822366 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 26 Jan 2018 19:49:04 +0000 (19:49 +0000)]
PR 62044: Force addition of generation number to shm filename on
all platforms. Keep persisted filename as-was.
[Reverted by r1822505]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822341 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 26 Jan 2018 15:00:28 +0000 (15:00 +0000)]
* modules/lua/config.m4: Link mod_lua against -lcrypt if available,
since mk_password_hash() can use crypt().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822305 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ferradal [Wed, 24 Jan 2018 14:42:25 +0000 (14:42 +0000)]
First set of fixes for mod_ssl Spanish Translation plus rendering with new Directive listing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1822108 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 21 Jan 2018 02:33:55 +0000 (02:33 +0000)]
mod_crypto requires non-default apr-util option. Do not build by default
but require user interaction until apu changes HAVE_CRYPTO default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821768 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 21 Jan 2018 02:16:25 +0000 (02:16 +0000)]
LibreSSL doesn't have or require applink.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821767 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 21 Jan 2018 02:12:46 +0000 (02:12 +0000)]
copy applink.c in OpenSSL 1.1.0 to from /ms to /include to match location in 1.0.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821766 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 20 Jan 2018 02:23:09 +0000 (02:23 +0000)]
ssl_engine_init.c(33) includes mod_md.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821727 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 14:16:01 +0000 (14:16 +0000)]
mpm_fdqueue: follow up to r1821624.
Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821660 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 14:04:53 +0000 (14:04 +0000)]
mpm_fdqueue: follow up to r1821624.
Either error matters, simplify code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821659 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 13:46:28 +0000 (13:46 +0000)]
mpm_fdqueue: follow up to r1821624.
Be explicit in the naming about what's push/pop-ed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821651 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 13:30:19 +0000 (13:30 +0000)]
mpm_worker: follow up to r1821624.
Free idle pools while stopping.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821650 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 13:22:30 +0000 (13:22 +0000)]
mpm_fdqueue: follow up to r1821624.
Cosmetics, 80 cols, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821649 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:59:12 +0000 (12:59 +0000)]
mpm_fdqueue: follow up to r1821624.
Fix typo in comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821648 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:57:20 +0000 (12:57 +0000)]
mpm_fdqueue: follow up to r1821624.
The code is not part of the API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821647 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:40:05 +0000 (12:40 +0000)]
mpm_fdqueue: follow up to r1821624.
The implemention wants APR_HAS_THREADS too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821644 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:29:18 +0000 (12:29 +0000)]
mpm_worker: follow up to r1821624.
Use common [mpm_]fdqueue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821639 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:24:52 +0000 (12:24 +0000)]
mpm_fdqueue: follow up to r1821624.
Prepare mpm_worker to use common fdqueue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821635 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:23:05 +0000 (12:23 +0000)]
mpm_fdqueue: follow up to r1821624.
Clear recycled_pools_count in ap_free_idle_pools().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821632 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:20:44 +0000 (12:20 +0000)]
mpm_fdqueue: follow up to r1821624.
Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821629 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:15:17 +0000 (12:15 +0000)]
mpm_fdqueue: follow up to r1821624.
Style, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821627 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:12:17 +0000 (12:12 +0000)]
mpm_fdqueue: follow up to r1821624.
Opacify fdqueue types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821626 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 12:07:23 +0000 (12:07 +0000)]
mpm_fdqueue: follow up to r1821624.
And now it's mpm_fdqueue, with minimal #includes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821625 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 11:46:12 +0000 (11:46 +0000)]
Shared fdqueue code between MPMs event and worker into mpm_fdqueue.
This first step moves the files server/mpm/event/fdqueue.[ch] to
server/mpm_fdqueue.[ch] (untouched for now, simple svn move).
Will follow up with the necessary changes to mpm_unix.* for common code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821624 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 11:29:00 +0000 (11:29 +0000)]
Revert r1821526, r1821527, r1821534, r1821538, r1821539, r1821541, r1821605, r1821607, r1821608.
Instead of copying event/fdqueue.c code into existing mpm_unix.c, losing all
contributors (blame, since r105919...), will restart the series by svn-moving
event/fdqueue.[ch] to server/mpm_fdqueue.[ch] first.
The code is not really unix specific either, so this sounds better.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821619 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 09:40:16 +0000 (09:40 +0000)]
mpm_worker: Follow up to r1821526.
Use common fdqueue.
[Reverted by r1821619]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821608 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 09:39:29 +0000 (09:39 +0000)]
mpm_unix: Follow up to r1821526.
Prepare mpm_worker to use common fdqueue.
[Reverted by r1821619]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821607 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 19 Jan 2018 09:34:17 +0000 (09:34 +0000)]
follow up to r1821582
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821606 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 09:32:53 +0000 (09:32 +0000)]
mpm_unix: Follow up to r1821526.
Clear recycled_pools_count in ap_free_idle_pools().
[Reverted by r1821619]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821605 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 19 Jan 2018 08:26:00 +0000 (08:26 +0000)]
mpm_event: Follow up to r1821558.
Don't crash (in listener) if we can't create the ptrans allocator.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821595 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 19 Jan 2018 02:46:06 +0000 (02:46 +0000)]
get mod_brotli in build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821582 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 19 Jan 2018 01:54:42 +0000 (01:54 +0000)]
some small tweaks to get things building again
replace mod_socache_redis.dsp as original was corrupted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821581 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 22:08:54 +0000 (22:08 +0000)]
Follow up to r1819855: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821562 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 22:05:53 +0000 (22:05 +0000)]
Follow up to r1821558: CHANGES typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821561 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 21:07:45 +0000 (21:07 +0000)]
mod_event: Let the listener thread do its maintenance job on resources shortage.
PR 61979.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821558 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 18 Jan 2018 21:02:04 +0000 (21:02 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1821557 13f79535 -47bb-0310-9956-
ffa450edef68