506 Commits

Author SHA1 Message Date
f1c5079459 * os/win32/modules.c: Include "ap_config.h" to match the file generated by
build/build-modules-c.awk. It doesn't change the behaviour because ap_config.h
  is included by httpd.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919392 13f79535-47bb-0310-9956-ffa450edef68
2024-07-20 12:15:48 +00:00
8f64f34d68 * os/win32/modules.c: Add AP_DECLARE_DATA to ap_prelinked_module_symbols
to match definition in ap_config.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919391 13f79535-47bb-0310-9956-ffa450edef68
2024-07-20 12:13:26 +00:00
4fc2fd7dd5 Make sources build with latest clang version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909450 13f79535-47bb-0310-9956-ffa450edef68
2023-04-27 07:14:36 +00:00
243c5fad0a mpm_{event,worker,prefork}: late stop of children processes on restart.
Change how the main process handles restarts, from:
    0. <restart signal>
    1. stop old generation of children processes (graceful or not)
    2. reload new configuration
    3. start new generation of children processes
to:
    0. <restart signal>
    1. reload new configuration
    2. stop old generation of children processes (graceful or not)
    3. start new generation of children processes

The delay between stop and start is now very short and does not depend on the
reload time (which can be quite long with many vhosts and/or complex setups
with regexps or whatever third party components to compile).

Also, while reloading, the old generation of children processes keeps accepting
and handling incoming connections until the new generation is up to take over.

* os/unix/unixd.c (sig_term, sig_restart):
  Set AP_MPMQ_STOPPING only once.

* server/listen.c (ap_duplicate_listeners):
  Use ap_log_error() the main server instead of ap_log_perror().

* server/mpm/{event,worker,prefork}/{event,worker,prefork}.c
    ({event,worker,prefork}_retained_data):
  Save the generation pool pointer (gen_pool) and all the buckets here, they
  won't be cleared before the reload like pconf so they need a persitent
  storage accross restarts (i.e. retained->gen_pool).

* server/mpm/{event,worker,prefork}/{event,worker,prefork}.c
    (perform_idle_server_maintenance, child_main, make_child):
  Change usage of all_buckets (previously with global/static scope) to the new
  retained->buckets array.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1892587 13f79535-47bb-0310-9956-ffa450edef68
2021-08-24 22:22:40 +00:00
5c1380bcb6 Pass NULL instead of a "null ACL"
Submitted By: Ivan Zhakov



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1889037 13f79535-47bb-0310-9956-ffa450edef68
2021-04-21 01:03:46 +00:00
0d25d5a8a8 "" is appropriate default DEFAULT_REL_STATEDIR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877959 13f79535-47bb-0310-9956-ffa450edef68
2020-05-20 18:27:04 +00:00
482089e7e1 Windows bits for mod_log_json.dsp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877688 13f79535-47bb-0310-9956-ffa450edef68
2020-05-13 10:43:05 +00:00
8f55fe9f98 * os/win32/win32_config_layout: Define DEFAULT_REL_STATEDIR for Win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877471 13f79535-47bb-0310-9956-ffa450edef68
2020-05-07 11:38:29 +00:00
a42f3692b1 Add optional options= argument to Listen to add listener-specific
socket options.

Reimplement "use_specific_errors" listener flag under generic
ap_listen_rec flags field holding all listener-specific options.

* include/ap_listen.h: Add AP_LISTEN_* flags.
  (ap_listen_rec): Rename use_specific_errors to flags.

* server/listen.c (make_sock): Set APR_SO_FREEBIND if
  AP_LISTEN_FREEBIND flag is set on listener; set APR_SO_REUSEPORT
  unconditionally if AP_LISTEN_REUSEPORT is set.
  (alloc_listener): Take flags argument.
  (ap_setup_listeners): Set AP_LISTEN_SPECIFIC_ERRORS flag here.
  (ap_set_listener): Parse optional options=... argument, catch
  typos and fail if protocol name contains a "=".
  (ap_duplicate_listeners): Duplicate flags.

Submitted by: jkaluza, Lubos Uhliarik <luhliari redhat.com>, jorton
PR: 61865
Github: closes #114


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876865 13f79535-47bb-0310-9956-ffa450edef68
2020-04-23 08:26:26 +00:00
396d68be58 image size 0x34000 exceeds specified maximum 0x30000
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832880 13f79535-47bb-0310-9956-ffa450edef68
2018-06-04 18:54:47 +00:00
f5c6ef494e 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
2018-05-02 11:16:00 +00:00
2d80cdeb7b add apreq in Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825396 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 18:36:15 +00:00
7ac49b7933 add mod_proxy_uwsgi.so to windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824736 13f79535-47bb-0310-9956-ffa450edef68
2018-02-19 11:12:41 +00:00
7fa2267d94 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
2018-01-29 17:00:23 +00:00
346a85a8bd 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
2018-01-10 02:27:52 +00:00
db74222513 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
2018-01-08 16:45:53 +00:00
98e9503120 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
2018-01-04 15:10:45 +00:00
0e295e2e15 Win32 legacy bits for mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1815264 13f79535-47bb-0310-9956-ffa450edef68
2017-11-14 21:01:37 +00:00
eb0229b1a5 Fix compilation failure :
unixd.c: In function ‘ap_unixd_mpm_set_signals’:
unixd.c:579:5: error: implicit declaration of function ‘apr_signal’; did you mean ‘strsignal’? [-Werror=implicit-function-declaration]
     apr_signal(SIGPIPE, SIG_IGN);
     ^~~~~~~~~~
     strsignal

Not sure where it comes from, maybe related to r1812301.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1813116 13f79535-47bb-0310-9956-ffa450edef68
2017-10-24 03:20:56 +00:00
1ebc68400d MPMs unix: follow up to r1809881 and r1809973.
unset_signals() is called when ap_pglobal is destroyed too.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809976 13f79535-47bb-0310-9956-ffa450edef68
2017-09-28 11:31:57 +00:00
a16360a61f core, MPMs unix: follow up to r1809881.
Deregister all hooks first (in pre_cleanup), by doing it last we could still
have had them run when DSOs were unloaded.

Likewise, avoid double faults when handling fatal signals by restoring the
default handler before pconf is cleared (we can't ap_log_error there).

Finally, we need to ignore sig_term/restart (do nothing) when the main
process is exiting (i.e. ap_pglobal is destroyed), since retained_data are
freed.

Aimed to fix all faults in PR 61558.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809973 13f79535-47bb-0310-9956-ffa450edef68
2017-09-28 11:08:09 +00:00
f46d03312e MPMs unix: Place signals handlers and helpers out of DSOs to avoid
a possible crash if a signal is caught during (graceful) restart.
PR 60487.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783849 13f79535-47bb-0310-9956-ffa450edef68
2017-02-21 09:07:42 +00:00
a697cb95be LINK : warning LNK4013: image size 0xB1000 exceeds specified maximum 0x20000
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780035 13f79535-47bb-0310-9956-ffa450edef68
2017-01-24 07:50:31 +00:00
280008d94d add mod_proxy_hcheck to legacy build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1771839 13f79535-47bb-0310-9956-ffa450edef68
2016-11-29 03:27:37 +00:00
44c1d726d1 mod_brotli: Add initial implementation.
This new module supports dynamic Brotli (RFC 7932) compression.  Existing
mod_deflate installations can benefit from better compression ratio by
sending Brotli-compressed data to the clients that support it:

    SetOutputFilter BROTLI_COMPRESS;DEFLATE

The module features zero-copy processing, which is only possible with the
new API from the upcoming 1.0.x series of brotli [1].  The Linux makefile
works against libbrotli [2], as currently the core brotli repository doesn't
offer a way to build a library [3].  Apart from that, only the CMake build
is now supported.

[1] https://github.com/google/brotli
[2] https://github.com/bagder/libbrotli
[3] https://github.com/google/brotli/pull/332


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1761714 13f79535-47bb-0310-9956-ffa450edef68
2016-09-21 10:38:48 +00:00
d79b514c4b Fix spelling in comments and text files.
No functional change.
PR 59990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
2016-08-11 19:50:02 +00:00
bec200611b Support build files for mod_proxy_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1744792 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 20:11:41 +00:00
ac26fcdb9b mod_http2 larger with 64-bit VS 2012 RelWithDebInfo build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706635 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 21:24:29 +00:00
df0a03587e bye bye mod_h2, hello mod_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705749 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28 19:26:32 +00:00
98077e4911 Windows traditional build files for mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698023 13f79535-47bb-0310-9956-ffa450edef68
2015-08-26 22:14:16 +00:00
cfd84fad8a cosmetic: match case style to all previous
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696490 13f79535-47bb-0310-9956-ffa450edef68
2015-08-18 19:50:08 +00:00
25a2e41ea7 Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657692 13f79535-47bb-0310-9956-ffa450edef68
2015-02-05 21:03:04 +00:00
44fe3a68a5 include mod_ssl_ct
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1631603 13f79535-47bb-0310-9956-ffa450edef68
2014-10-14 00:11:52 +00:00
56d0c25725 Add missing APLOGNO.
Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.
Split lines longer than 80.
Improve alignment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612068 13f79535-47bb-0310-9956-ffa450edef68
2014-07-20 09:32:58 +00:00
6625c31ba1 'ap_getword_conf' does not return NULL but an empty string if nothing could be got.
So the message 02173 can never trigger.

Actually, this is not a problem because all calls to 'ap_unixd_set_rlimit' are done in configuration parsing functions guarded with AP_INIT_TAKE12, so we are guaranteed to have something.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551005 13f79535-47bb-0310-9956-ffa450edef68
2013-12-15 07:53:09 +00:00
86335b8bb8 BaseAddr.ref:
. Update sizes as necessary based on a 64-bit debug build with Visual Studio
  2012.
. Add missing modules mod_apreq, mod_authnz_fcgi, mod_dialup,
  mod_optional_fn_export, mod_optional_fn_import, mod_optional_hook_export,
  mod_optional_hook_import, and mod_policy.
  (The example mods aren't important, but adding them avoids having to
  treat those as exceptions in any sort of automatic update mechanism.
  Potential issues with the several modules that aren't currently buildable
  with the cmake-based solution have not been addressed.)

fixBaseAddrs.pl:
. New script to generate a new BaseAddr.ref based on Microsoft linker
  warnings about inadequate size or missing module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1522544 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 12:15:02 +00:00
143d9b62b8 Increase stack size for mod_cache and mod_ldap and readdress
VC11 reporting image size exceeds specified maximum

Reported by Steffen <info apachelounge com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1505178 13f79535-47bb-0310-9956-ffa450edef68
2013-07-20 18:14:43 +00:00
e5d0f97ec8 Final rename per r1454386, we hope
Set eol style of mod_proxy_wstunnel.dsp to native
for easy editing on any OS



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454659 13f79535-47bb-0310-9956-ffa450edef68
2013-03-09 05:51:48 +00:00
723bba5dff finish up mod_proxy_websocket/tunnel rename on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453974 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 17:27:55 +00:00
60efc021bb Add mod_proxy_websocket to Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453552 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 20:54:48 +00:00
a7a919ad86 The days of 9x, Win2K are long gone. No more need of a stub
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1447992 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 04:03:42 +00:00
d5a372ff78 Fix valgrind warning about uninitialized memory in argument to semctl
PR: 53690
Submitted by: Mikhail T. <mi+apache aldan algebra com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442326 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 20:15:10 +00:00
62980ad902 fix r1439000 per rjung remarks
http://marc.info/?l=apache-httpd-dev&m=135925949528376&w=2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439027 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 05:45:21 +00:00
3fb478dd70 mod_lua image size has surpassed 0x00010000, step it up a notch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439000 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 00:08:04 +00:00
8e0c2d91e0 Add mod_macro to Windows build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436058 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 01:20:33 +00:00
3e8254fb4c Add mod_allowhandlers to Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418867 13f79535-47bb-0310-9956-ffa450edef68
2012-12-09 09:46:47 +00:00
f696d241c7 Windows build for mod_cache_socache added in r1388660
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388899 13f79535-47bb-0310-9956-ffa450edef68
2012-09-22 21:14:00 +00:00
76f782e188 Various code cleanup to avoid compiler, cppcheck, or clang warnings:
modules/debugging/mod_firehose.c: Make some internal functions static
                                  (to do: logs_cleanup() is unused)

modules/filters/mod_charset_lite.c: Remove dead assignments

modules/filters/mod_include.c: likewise

modules/metadata/mod_usertrack.c: likewise

modules/proxy/mod_proxy_ftp.c: likewise

modules/ssl/ssl_engine_pphrase.c: likewise

modules/proxy/mod_proxy_balancer.c: likewise;
                                    Remove NULL check that can never happen

modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it
                            would, it would just mask another bug

os/unix/unixd.c: likewise

modules/http/http_filters.c: Remove sub-condition that is always true

modules/lua/mod_lua.c: Add default cases to switch statements

modules/generators/mod_autoindex.c: Unsigned value can never be < 0

server/util_expr_eval.c: Fix compiler warnings with VC and on OS2



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220493 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 17:52:59 +00:00
86598d3b90 Fix my typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210869 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 11:28:44 +00:00
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00