Commit Graph

19 Commits

Author SHA1 Message Date
f97551a625 hide some unused code on Win32 and NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089910 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 15:16:20 +00:00
ddf06604b5 enable DEFAULT_REL_RUNTIMEDIR on NetWare and Windows
this commit is missing the Windows and NetWare build
logic to copy the appropriate file to include/ap_config_layout.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086073 13f79535-47bb-0310-9956-ffa450edef68
2011-03-27 23:51:18 +00:00
286c8622b6 Add a generic pool cleanup function that sets a pointer to NULL and use
it to replace various pool cleanup functions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032167 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 22:12:41 +00:00
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
fe7d50b6a2 It is not inconvenient to return the derived filename here, let's
save the caller later hassle in looking this up, if they like.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@940979 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 17:36:57 +00:00
ec56aba06f Fix startup segfault when the Mutex directive is used but no loaded
modules use httpd mutexes.

Add an init call from core's pre-config hook to ensure init is
performed before the config is parsed.

PR: 48787


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@912666 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 17:16:29 +00:00
b4e16bedea string constness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894361 13f79535-47bb-0310-9956-ffa450edef68
2009-12-29 11:51:40 +00:00
6536e1e8c7 fix this:
util_mutex.c: In function ‘ap_set_mutex’:
util_mutex.c:188: warning: comparison between pointer and integer
util_mutex.c:174: warning: unused variable ‘type’


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@886214 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 17:36:46 +00:00
13cb638cbd Add OmitPID keyword on Mutex directive to suppress the
addition of the parent pid to the generated lock file
name.

Change the Mutex directive syntax from

  Mutex default|mutex-name mechanism

to

  Mutex mechanism [default|mutex-name] ... [OmitPID]

as suggested by wrowe.  (Thanks!)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@886154 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 14:24:18 +00:00
7d8d2a34fa fix the "fix" in r883816
internal function ap_set_mutex() should be AP_DECLARE_NONSTD()
like our other directive parsers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883859 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 20:30:00 +00:00
7e6399e951 fix Win32 compile failure in r883540, reported by Gregg Smith
DEFAULT_REL_RUNTIMEDIR defined only in mpm_default.h for 
NetWare and dsp-based Win32 builds

mpm_default.h not in normal include path on Unix

thus, hardcode "logs" directory when DEFAULT_REL_RUNTIMEDIR
isn't defined

(file-based mutexes aren't configurable for those platforms anyway)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883828 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 19:28:34 +00:00
1254b08e61 fix Win32 compile failure in r883540, reported by Gregg Smith
(on Win32, external APIs use one calling convention while directive 
parsers use a different one)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883816 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 19:06:16 +00:00
8cfde79c69 fix Win32 compile failure in r883540, reported by Gregg Smith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883802 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 17:55:37 +00:00
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
ee826b54da remove leader, perchild, and threadpool MPMs (other than non-English bits in common parts of the manual)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758613 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 12:44:48 +00:00
a324a1d72f Remove all references to CORE_PRIVATE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 10:45:43 +00:00
8d7fe950f2 ap_available_mutexes_string and ap_add_available_mutexes_string
cannot be data symbols when mod_ssl is built as a loadable module;
using an external string constant in a loadable module is not portable.

Also reorganize file and sem to follow their explicit mechanisms,
and ensured that the explicit mechansims are listed in order of 
preference.  

This raises a question, would [fcntl|file] be a clearer way of 
indiciating what the file/sem methods devolve to?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@568833 13f79535-47bb-0310-9956-ffa450edef68
2007-08-23 05:55:11 +00:00
8b6364d494 Minor quibble; the declarespec for data comes after the data type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@568794 13f79535-47bb-0310-9956-ffa450edef68
2007-08-23 01:29:38 +00:00
707d1dabb9 Once SSLMutex allowed for the setting of both the
locking method and the lockfile location, I never
liked how AcceptMutex was linked to LockFile. This
seemed unnecessary. Much better to have AcceptMutex
do both as well. Plus, now that we will likely see
other modules require a "standard" way of setting
mutexes, why not have Apache provide that as
an API of sorts.

Anyway, LockFile is now depreciated and AcceptMutex
is now SSLMutex-like. We also provide a short
function that "parses" out a mutex parameter
and strips out the mechanism and lockfile location.
AcceptMutex and SSLMutex is this capability.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@467326 13f79535-47bb-0310-9956-ffa450edef68
2006-10-24 13:17:29 +00:00