1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

40 Commits

Author SHA1 Message Date
Yann Ylavic
e454f1a48b mod_macro: Clear macros before initialization to avoid use-after-free
on startup or restart when the module is linked statically. PR 57525

Submitted by: apache.org tech.futurequest.net
Committed by: Yann Ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656669 13f79535-47bb-0310-9956-ffa450edef68
2015-02-03 10:42:21 +00:00
Christophe Jaillet
6ba037ed5c Remove APLOG_NOERRNO.
Add some APLOGNO.
Fix some alignment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612466 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 05:17:10 +00:00
Christophe Jaillet
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
Christophe Jaillet
04737f0afa Rename module name in doxygen + partly revert r832442 which skipped doxygen doc generation for 'mod_watchdog.h'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1597642 13f79535-47bb-0310-9956-ffa450edef68
2014-05-26 20:25:01 +00:00
Jeff Trawick
f63c145039 fix spelling error in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1571368 13f79535-47bb-0310-9956-ffa450edef68
2014-02-24 17:50:16 +00:00
Christophe Jaillet
fef0c66526 Allocate correct size for the array to avoid useless memory allocation and copy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555259 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 21:42:40 +00:00
André Malo
fdb6d62d78 eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484554 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 18:22:55 +00:00
Gregg Lewis Smith
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
Guenter Knauf
2028b7c09d Added mod_macro to NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1435834 13f79535-47bb-0310-9956-ffa450edef68
2013-01-20 13:04:40 +00:00
Fabien Coelho
cecc389cfd Add "mod_macro" as a standard module, compiled in with "most".
This module was created in 1998 and has been distributed independently
ever since. It is hereby donated to the Apache Software Foundation.

There are quite a few comments in the source code to explain how it works,
as well as extensive non regression tests.

Some utilities about array processing could be moved to "core.c".
However, I finally decided against for now so that it stays as an external
and independent module, and thus may be backported with minimal impact
on the source tree.

Details of the addition:

* modules/core/mod_macro.c: module source code
* modules/core/test: non regression tests
  modules/core/test/conf/: configuration files
  modules/core/test/ref/: expected results
* docs/manual/mod/mod_macro.xml: English documentation
* docs/manual/mod/mod_macro.xml.fr: French documentation



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1435811 13f79535-47bb-0310-9956-ffa450edef68
2013-01-20 10:07:44 +00:00
Stefan Fritsch
5d010bf77c If a filename without slashes is specified for LoadFile or
LoadModule and the file cannot be found in the server root directory,
try to use the standard dlopen() search path. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1332378 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 20:50:45 +00:00
Mladen Turk
8238529b71 No need for process.h system include since we don't use getpid() any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210447 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:09:54 +00:00
Mladen Turk
f63c6e73bc Axe check for second post config call. New ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG API call does exactly that, so we were actually expecting 4 calls ending up with NULL config in child hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210445 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:07:47 +00:00
Stefan Fritsch
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
Stefan Fritsch
4554d337cc Remove some getpid() logging, this is now also included in the error log
format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208835 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 22:15:55 +00:00
Jeff Trawick
20c036f9f5 s/WATCHODG/WATCHDOG/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203331 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 19:07:08 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Jim Jagielski
103f776c25 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:38:09 +00:00
Stefan Fritsch
9026104550 Simplify mod_watchdog dependency checking code. This also fixes mod_watchdog
being built shared even with --enable-mods-static=reallyall.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154118 13f79535-47bb-0310-9956-ffa450edef68
2011-08-05 08:20:56 +00:00
Stefan Fritsch
32d9e326ef adjustments of build priorities of modules without special dependencies
all -> most:
- mod_sed

reallyall -> most:
- mod_log_debug

reallyall -> all:
- mod_dav_lock
- mod_echo
- mod_charset_lite
- mod_slotmem_plain
- mod_dialup

few -> all:
- mod_data
- mod_reflector
- mod_asis

most -> all:
- mod_heartbeat
- mod_heartmonitor
- mod_watchdog

most -> reallyall:
- mod_imagemap
- mod_cern_meta
- mod_ident

See thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%3C201107052321.56063.sf@sfritsch.de%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146227 13f79535-47bb-0310-9956-ffa450edef68
2011-07-13 18:59:28 +00:00
William A. Rowe Jr
e8da0ffbc0 solve getpid() process.h function order
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1129914 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 20:55:02 +00:00
Stefan Fritsch
d2b73e5730 Fix two bugs introduced by r1070153
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070317 13f79535-47bb-0310-9956-ffa450edef68
2011-02-13 22:34:02 +00:00
Stefan Fritsch
385da96d50 Use ap_state_query() to fix many modules that were not correctly initializing
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070153 13f79535-47bb-0310-9956-ffa450edef68
2011-02-12 21:23:56 +00:00
Daniel Earl Poirier
4c477008d4 Add to modules' help text (displayed by ./configure -h) more
information that will be useful in deciding whether to enable
them or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029814 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 20:02:51 +00:00
Guenter Knauf
2768a20d29 Added header include for getpid() prototype on Win32.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025496 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 11:03:01 +00:00
Stefan Fritsch
ae5ef058ac Add ap_find_module_short_name() to quickly get the module short name
(i.e. symbol name with trailing "_module" removed) from the module_index.
To be used for logging.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@965408 13f79535-47bb-0310-9956-ffa450edef68
2010-07-19 10:06:15 +00:00
Brian Havard
e137b779d7 OS/2 build fix:
Remove use of non-portable apr_get_os_error() and just return APR_ENOMEM if
apr_pcalloc() returns NULL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956860 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 12:23:13 +00:00
Rainer Jung
0e7b38edb8 Fix comment. DSO is now default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@952008 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 22:06:14 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
William A. Rowe Jr
01d300298f Catch up with ap_[proc|global]_mutex_create api change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@940981 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 17:40:43 +00:00
Jeff Trawick
0644e027f4 tweaks to r883540:
watchdog: use better mutex type name
  ldap/digest: use same FOO_mutex_type variable name as other modules
    for easier searching


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883708 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:47:55 +00:00
Jeff Trawick
2e9668a33d Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
and WatchdogMutexPath with a single Mutex directive.  Add APIs to
simplify setup and user customization of APR proc and global mutexes.  
(See util_mutex.h.)  Build-time setting DEFAULT_LOCKFILE is no longer
respected; set DEFAULT_REL_RUNTIMEDIR instead.

Some existing modules, such as mod_ldap and mod_auth_digest gain 
configurability for their mutexes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:17:51 +00:00
Daniel Earl Poirier
e30af9ed74 Fix remaining doxygen warnings. "make dox" is now clean with doxygen
version 1.5.8.

PR: 48093
Submitted by: Brad Hards
Reviewed by: poirier


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832442 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 14:59:24 +00:00
Daniel Earl Poirier
04fd4abf90 Fix a lot of doxygen warnings. Thanks to Brad Hards for the patch.
I added a few more fixes, and there are still more that might
need a doxygen expert.

PR: 48061
Submitted by: Brad Hards
Reviewed by: poirier


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830527 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 13:25:49 +00:00
Jeff Trawick
e054fa7183 change the callable functions in the mod_watchdog API
to optional hooks to avoid module ordering or other symbol
resolution issues; affected:

  ap_watchdog_get_instance
  ap_watchdog_register_callback
  ap_watchdog_set_callback_interval


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820427 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 20:00:37 +00:00
Jeff Trawick
cb60d8c127 don't override the user's choice (e.g., --enable-watchdog)
when deciding how it is enabled by default


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820407 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 19:26:52 +00:00
Jeff Trawick
03012e8a4b tweak spelling/wording in mod_watchdog documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820370 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 18:21:36 +00:00
William A. Rowe Jr
5181635ab3 Always make mod_*.h files available where they exist, modpath by modpath
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808722 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 01:27:46 +00:00
Guenter Knauf
1bcd22de93 finally fixed NetWare export list (thanks help from rjung).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@792154 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 14:17:39 +00:00
William A. Rowe Jr
bc8cdc7896 Here's the simpler solution to the two groups of mappers/ modules...
The mod_so and mod_watchdog are truly not mappers/ at all.  Very open
to better names than modules/core/ but these are clearly API's which
are to be consumed by the httpd core, or generically, any module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772848 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 05:46:28 +00:00