]> granicus.if.org Git - apache/log
apache
6 years agoRevert r1822800 and r1822804.
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

6 years agomod_proxy_balancer: follow up tp r1822509 and r1822800.
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

6 years agomod_proxy_balancer: follow up tp r1822509.
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

6 years agocore: follow up to r1822596.
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

6 years agoOn the trunk:
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

6 years agocore: don't send EOR bucket through request filters.
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

6 years agocore: fix ap_request_core_filter()'s brigade lifetime.
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

6 years agompm_unix(es): cleanup properly on exit in one_process mode.
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

6 years agoRevert r1814112, it does not work for threaded MPMs.
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

6 years agomod_proxy: fix proxy connection cleanup from an n+2 pool.
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

6 years agomod_slotmem_shm: follow up tp r1822509.
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

6 years agomod_slotmem_shm: Rework SHM reuse/deletion.
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

6 years agoRevert r1822341, slotmems are not reused on (graceful) restart.
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

6 years agomod_http2/mod_proxy_http2: add new module flags
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

6 years agoOn the trunk:
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

6 years agoOn the trunk:
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agoPR 62044: Force addition of generation number to shm filename on
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

6 years ago* modules/lua/config.m4: Link mod_lua against -lcrypt if available,
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

6 years agoFirst set of fixes for mod_ssl Spanish Translation plus rendering with new Directive...
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

6 years agomod_crypto requires non-default apr-util option. Do not build by default
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

6 years agoLibreSSL doesn't have or require applink.c
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

6 years agocopy applink.c in OpenSSL 1.1.0 to from /ms to /include to match location in 1.0.2
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

6 years agossl_engine_init.c(33) includes mod_md.h
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_worker: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_worker: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agompm_fdqueue: follow up to r1821624.
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

6 years agoShared fdqueue code between MPMs event and worker into mpm_fdqueue.
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

6 years agoRevert r1821526, r1821527, r1821534, r1821538, r1821539, r1821541, r1821605, r1821607...
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

6 years agompm_worker: Follow up to r1821526.
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

6 years agompm_unix: Follow up to r1821526.
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

6 years agofollow up to r1821582
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

6 years agompm_unix: Follow up to r1821526.
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

6 years agompm_event: Follow up to r1821558.
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

6 years agoget mod_brotli in build
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

6 years agosome small tweaks to get things building again
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

6 years agoFollow up to r1819855: CHANGES entry.
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

6 years agoFollow up to r1821558: CHANGES typo.
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

6 years agomod_event: Let the listener thread do its maintenance job on resources shortage.
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

6 years agoBackported.
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

6 years agoFollow up to r1821526: rename ap_queue_info_get_idlers to ap_queue_info_num_idlers.
Yann Ylavic [Thu, 18 Jan 2018 18:40:09 +0000 (18:40 +0000)]
Follow up to r1821526: rename ap_queue_info_get_idlers to ap_queue_info_num_idlers.

[Reverted by r1821619]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821541 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1821526: style, no functional change.
Yann Ylavic [Thu, 18 Jan 2018 18:35:20 +0000 (18:35 +0000)]
Follow up to r1821526: style, no functional change.

[Reverted by r1821619]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821539 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1821526: opacify fdqueue types.
Yann Ylavic [Thu, 18 Jan 2018 18:28:25 +0000 (18:28 +0000)]
Follow up to r1821526: opacify fdqueue types.

[Reverted by r1821619]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821538 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1821526: mpm_unix.h needs this includes only for now.
Yann Ylavic [Thu, 18 Jan 2018 18:05:37 +0000 (18:05 +0000)]
Follow up to r1821526: mpm_unix.h needs this includes only for now.

[Reverted by r1821619]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821534 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1821526: mpm_unix.h
Yann Ylavic [Thu, 18 Jan 2018 17:54:41 +0000 (17:54 +0000)]
Follow up to r1821526: mpm_unix.h

The fdqueue code is not for WIN32 (per mpm_unix.c), and does not seem to
require all the #includes (system) it claimed (at least in .h).

[Reverted by r1821619]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821527 13f79535-47bb-0310-9956-ffa450edef68

6 years agoShare fdqueue code between MPMs event and worker.
Yann Ylavic [Thu, 18 Jan 2018 17:45:40 +0000 (17:45 +0000)]
Share fdqueue code between MPMs event and worker.

This first step moves the content of server/mpm/event/fdqueue.c to
the existing server/mpm_unix.c file, and the server/mpm/event/fdqueue.h file
to trunk/server/mpm_unix.h (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.

[Reverted by r1821619]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821526 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1821504: same comment in event than in worker.
Yann Ylavic [Thu, 18 Jan 2018 14:56:22 +0000 (14:56 +0000)]
Follow up to r1821504: same comment in event than in worker.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821505 13f79535-47bb-0310-9956-ffa450edef68

6 years agompm_{event,worker}: Mask signals for threads created by modules in child init.
Yann Ylavic [Thu, 18 Jan 2018 14:47:41 +0000 (14:47 +0000)]
mpm_{event,worker}: Mask signals for threads created by modules in child init.

PR 62009, so that they don't receive (implicitely) the ones meant for the MPM.

Inspired by: Armin Abfalterer <a.abfalterer gmail.com>
Proposed by: Yann Ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821504 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRevert r1821499, will re-commit the right change.
Yann Ylavic [Thu, 18 Jan 2018 14:43:38 +0000 (14:43 +0000)]
Revert r1821499, will re-commit the right change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821503 13f79535-47bb-0310-9956-ffa450edef68

6 years agompm_event,worker: Mask signals for threads created by modules in child init.
Yann Ylavic [Thu, 18 Jan 2018 14:19:28 +0000 (14:19 +0000)]
mpm_event,worker: Mask signals for threads created by modules in child init.

PR 62009, so that they don't receive (implicitely) the ones meant for the MPM.

Inspired by: Armin Abfalterer <a.abfalterer gmail com>
Proposed by: Yann Ylavic

[Reverted by r1821503]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821499 13f79535-47bb-0310-9956-ffa450edef68

6 years agoOn the trunk:
Stefan Eissing [Wed, 17 Jan 2018 14:50:58 +0000 (14:50 +0000)]
On the trunk:

mod_md:  removing comments that documented that greenbytes has untransferable copyright to the sources. The rights, of course, remain unaffected, but maybe some people can sleep better.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821374 13f79535-47bb-0310-9956-ffa450edef68

6 years agoOn the trunk:
Stefan Eissing [Wed, 17 Jan 2018 14:41:30 +0000 (14:41 +0000)]
On the trunk:

mod_http2: removing comments that documented that greenbytes has untransferable copyright to the sources. The rights, of course, remain unaffected, but maybe some people can sleep better.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821371 13f79535-47bb-0310-9956-ffa450edef68

6 years agofix copy & paste error, util_cookies.h is in include not server.
Gregg Lewis Smith [Mon, 15 Jan 2018 19:08:01 +0000 (19:08 +0000)]
fix copy & paste error, util_cookies.h is in include not server.
add util_config.c now needed per steffenal.
http://mail-archives.apache.org/mod_mbox/httpd-dev/201801.mbox/%3C4C412873-869D-4A0C-89E6-397706EFA1F7@apachelounge.com%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821195 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFixed word 'Directive' placement in the directives list. In Spanish we must sort...
Daniel Ferradal [Mon, 15 Jan 2018 16:15:25 +0000 (16:15 +0000)]
Fixed word 'Directive' placement in the directives list. In Spanish we must sort them the same as in French. Correct format is: 'Directiva xxxx', not the opposite

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821179 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocs: update the prettify.js files with new directives
Luca Toscano [Sun, 14 Jan 2018 22:34:39 +0000 (22:34 +0000)]
docs: update the prettify.js files with new directives

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821120 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Sun, 14 Jan 2018 14:01:21 +0000 (14:01 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821107 13f79535-47bb-0310-9956-ffa450edef68

6 years agoNew XML file.
Lucien Gentis [Sun, 14 Jan 2018 14:00:17 +0000 (14:00 +0000)]
New XML file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821105 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_md manual: updated version and added note about current port requirements
Stefan Eissing [Sun, 14 Jan 2018 11:47:21 +0000 (11:47 +0000)]
mod_md manual: updated version and added note about current port requirements

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821095 13f79535-47bb-0310-9956-ffa450edef68

6 years agoInitial version of Spanish Translation for mod_status.xml
Daniel Ferradal [Sat, 13 Jan 2018 17:33:06 +0000 (17:33 +0000)]
Initial version of Spanish Translation for mod_status.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821078 13f79535-47bb-0310-9956-ffa450edef68

6 years agoWe track merges at the root only.
Yann Ylavic [Sat, 13 Jan 2018 16:39:14 +0000 (16:39 +0000)]
We track merges at the root only.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821075 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Sat, 13 Jan 2018 15:16:50 +0000 (15:16 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821064 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML update.
Lucien Gentis [Sat, 13 Jan 2018 15:15:58 +0000 (15:15 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821063 13f79535-47bb-0310-9956-ffa450edef68

6 years agoApache-apr2.dsw
Gregg Lewis Smith [Sat, 13 Jan 2018 00:12:19 +0000 (00:12 +0000)]
Apache-apr2.dsw
freetds connector now unsupported in apr-util
conectors are in apr-util
s/mod_mmd/mod_md

Apache.dsw
freetds connector now unsupported in apr-util
s/mod_mmd/mod_md

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821040 13f79535-47bb-0310-9956-ffa450edef68

6 years agoInitial version of Spanish Translation for mod_ssl aka -It's been hell- and related...
Daniel Ferradal [Thu, 11 Jan 2018 18:40:39 +0000 (18:40 +0000)]
Initial version of Spanish Translation for mod_ssl aka -It's been hell- and related files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820909 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1740910: CHANGES entry.
Yann Ylavic [Thu, 11 Jan 2018 00:23:09 +0000 (00:23 +0000)]
Follow up to r1740910: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820809 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFollow up to r1802618: CHANGES entry.
Yann Ylavic [Thu, 11 Jan 2018 00:03:50 +0000 (00:03 +0000)]
Follow up to r1802618: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820808 13f79535-47bb-0310-9956-ffa450edef68

6 years agoavoid ap_set_content_type when processing a _Request_Header set|edit|unset Content...
Eric Covener [Wed, 10 Jan 2018 13:47:53 +0000 (13:47 +0000)]
avoid ap_set_content_type when processing a _Request_Header set|edit|unset Content-Type.

identified by ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820750 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_socache_redis seems to be missing
Gregg Lewis Smith [Wed, 10 Jan 2018 02:27:52 +0000 (02:27 +0000)]
mod_socache_redis seems to be missing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820719 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPR 61980: AH01215 CGI stderr forwarding msg improvement
Eric Covener [Wed, 10 Jan 2018 00:57:22 +0000 (00:57 +0000)]
PR 61980: AH01215 CGI stderr forwarding msg improvement

*) mod_cgi: Improve AH01215 messages to make it more clear that the message is
  the CGI scripts stderr output. PR 61980. [Hank Ibell <hwibell gmail.com>]

Submitted By: Hank Ibell <hwibell gmail.com>
Commited By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820716 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPR 61983: "Header unset Content-Type" doesn't work
Eric Covener [Wed, 10 Jan 2018 00:52:25 +0000 (00:52 +0000)]
PR 61983: "Header unset Content-Type" doesn't work

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820715 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_md: maxsize was less than the resulting image size
Yann Ylavic [Mon, 8 Jan 2018 16:45:53 +0000 (16:45 +0000)]
mod_md: maxsize was less than the resulting image size

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820583 13f79535-47bb-0310-9956-ffa450edef68

6 years agoDocumentation rebuild
Luca Toscano [Mon, 8 Jan 2018 10:17:23 +0000 (10:17 +0000)]
Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820540 13f79535-47bb-0310-9956-ffa450edef68

6 years agoevent.xml: follow up r1820466 with Yann's suggestions
Luca Toscano [Mon, 8 Jan 2018 10:16:36 +0000 (10:16 +0000)]
event.xml: follow up r1820466 with Yann's suggestions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820539 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_md's docs rebuild
Luca Toscano [Sun, 7 Jan 2018 14:38:08 +0000 (14:38 +0000)]
mod_md's docs rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820465 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_md.xml: update MDCertificateAgreement's links
Luca Toscano [Sun, 7 Jan 2018 14:35:25 +0000 (14:35 +0000)]
mod_md.xml: update MDCertificateAgreement's links

Patch from Bernard Spil (brnrd freebsd.org). PR 61923

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820464 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Sat, 6 Jan 2018 13:53:36 +0000 (13:53 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820399 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML update.
Lucien Gentis [Sat, 6 Jan 2018 13:52:46 +0000 (13:52 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820398 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocumentation rebuild
Luca Toscano [Fri, 5 Jan 2018 15:30:52 +0000 (15:30 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820313 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_md: adding new directive to manual.
Stefan Eissing [Fri, 5 Jan 2018 15:21:06 +0000 (15:21 +0000)]
mod_md: adding new directive to manual.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820312 13f79535-47bb-0310-9956-ffa450edef68

6 years agoOn the trunk:
Stefan Eissing [Fri, 5 Jan 2018 15:16:13 +0000 (15:16 +0000)]
On the trunk:

mod_md v1.1.8: new configuration directive "MDBaseServer on|off" to allow/inhibit
     management of the base server domains outside VirtualHosts. By default, this is "off",
     e.g. mod_md will not manage certificates or perform https: redirections on the
     base server.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820310 13f79535-47bb-0310-9956-ffa450edef68

6 years agoAdding new french translated XML file.
Lucien Gentis [Thu, 4 Jan 2018 16:54:38 +0000 (16:54 +0000)]
Adding new french translated XML file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820130 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Thu, 4 Jan 2018 16:30:17 +0000 (16:30 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820120 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML updates.
Lucien Gentis [Thu, 4 Jan 2018 16:29:02 +0000 (16:29 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820118 13f79535-47bb-0310-9956-ffa450edef68

6 years agoincorporate review comments from RĂ¼diger
Eric Covener [Thu, 4 Jan 2018 16:05:02 +0000 (16:05 +0000)]
incorporate review comments from RĂ¼diger

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820113 13f79535-47bb-0310-9956-ffa450edef68

6 years agoHappy New Year 2018
Rainer Jung [Thu, 4 Jan 2018 15:15:21 +0000 (15:15 +0000)]
Happy New Year 2018

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820101 13f79535-47bb-0310-9956-ffa450edef68

6 years agommn bump for r1820098.
Eric Covener [Thu, 4 Jan 2018 15:13:50 +0000 (15:13 +0000)]
mmn bump for r1820098.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820099 13f79535-47bb-0310-9956-ffa450edef68

6 years agoAdd "AcceptErrorsNonFatal" directive
Eric Covener [Thu, 4 Jan 2018 15:10:45 +0000 (15:10 +0000)]
Add "AcceptErrorsNonFatal" directive

This tweaks accept() failure processing by having ap_unixd_accept
pass more errors up, and having the MPM's check against a macro
to see if they are in a whitelist of non ENETDOWN/EMFILE kind
of potential process-wide errors.

Default behavior is still to exit.

edit: MMN bump in 1820099.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1820098 13f79535-47bb-0310-9956-ffa450edef68