c75bda95cc
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
2018-01-29 14:43:21 +00:00
ea253a6373
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
2018-01-29 14:34:50 +00:00
5ff25379f5
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
2018-01-29 13:22:47 +00:00
4f9b578980
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
2018-01-29 13:10:22 +00:00
41515d4f09
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
2018-01-29 13:03:49 +00:00
d7328a07d7
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
2018-01-29 11:40:25 +00:00
92ac53a0a3
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
2018-01-27 02:09:07 +00:00
30b587effb
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
2018-01-27 02:01:47 +00:00
c666c50bbf
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
2018-01-26 19:49:04 +00:00
ecce8ad8cb
* 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
2018-01-26 15:00:28 +00:00
b11d1f2c74
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
2018-01-24 14:42:25 +00:00
3f217d0fb9
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
2018-01-21 02:33:55 +00:00
33f7a6d6c8
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
2018-01-21 02:16:25 +00:00
2f31ce917e
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
2018-01-21 02:12:46 +00:00
b4b75b32e6
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
2018-01-20 02:23:09 +00:00
5b6172385f
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
2018-01-19 14:16:01 +00:00
8d5f6ca44f
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
2018-01-19 14:04:53 +00:00
41ca9b3d01
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
2018-01-19 13:46:28 +00:00
0ca4811f5a
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
2018-01-19 13:30:19 +00:00
a121a58370
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
2018-01-19 13:22:30 +00:00
c61a6e27e5
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
2018-01-19 12:59:12 +00:00
3f16856817
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
2018-01-19 12:57:20 +00:00
e6c430a37c
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
2018-01-19 12:40:05 +00:00
bb88a667a6
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
2018-01-19 12:29:18 +00:00
22d8be1cf5
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
2018-01-19 12:24:52 +00:00
95fbbd8d27
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
2018-01-19 12:23:05 +00:00
2ef30515cf
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
2018-01-19 12:20:44 +00:00
39b3f18392
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
2018-01-19 12:15:17 +00:00
2f79ba80b5
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
2018-01-19 12:12:17 +00:00
0222a38bc8
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
2018-01-19 12:07:23 +00:00
62b44b5ec4
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
2018-01-19 11:46:12 +00:00
ff2d0af6cb
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
2018-01-19 11:29:00 +00:00
8f45a56cee
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
2018-01-19 09:40:16 +00:00
56cfe4c25f
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
2018-01-19 09:39:29 +00:00
2ce4d05fc5
follow up to r1821582
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821606 13f79535-47bb-0310-9956-ffa450edef68
2018-01-19 09:34:17 +00:00
5cf277ef5d
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
2018-01-19 09:32:53 +00:00
3ff6f80d69
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
2018-01-19 08:26:00 +00:00
0da57e8748
get mod_brotli in build
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821582 13f79535-47bb-0310-9956-ffa450edef68
2018-01-19 02:46:06 +00:00
130ccb055f
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
2018-01-19 01:54:42 +00:00
3326cefa11
Follow up to r1819855: CHANGES entry.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821562 13f79535-47bb-0310-9956-ffa450edef68
2018-01-18 22:08:54 +00:00
21e96b70c7
Follow up to r1821558: CHANGES typo.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821561 13f79535-47bb-0310-9956-ffa450edef68
2018-01-18 22:05:53 +00:00
cf5af9975d
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
2018-01-18 21:07:45 +00:00
8555523bc0
Backported.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821557 13f79535-47bb-0310-9956-ffa450edef68
2018-01-18 21:02:04 +00:00
85695a624a
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
2018-01-18 18:40:09 +00:00
d35f2f7675
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
2018-01-18 18:35:20 +00:00
b31ba4c83c
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
2018-01-18 18:28:25 +00:00
ed1e3421f0
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
2018-01-18 18:05:37 +00:00
a4d180680f
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
2018-01-18 17:54:41 +00:00
1c5106c6bf
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
2018-01-18 17:45:40 +00:00
a1689af8ce
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
2018-01-18 14:56:22 +00:00
