github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-13 15:07:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup mlogc logging and add note recommending against gnutls for SSL/TLS.

Browse Source
This commit is contained in:
b1v1r
2009-11-04 06:58:50 +00:00
parent a73da836e2
commit 68b95b3c24
4 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apache2/build/find_curl.m4
View File

@@ -70,12 +70,25 @@ if test -n "${curl_path}"; then
AC_MSG_NOTICE([NOTE: curl library may be too old: $CURL_VERSION])
fi
dnl # Check/warn if GnuTLS is used
AC_MSG_CHECKING([if libcurl is linked with gnutls])
curl_uses_gnutls=`echo ${CURL_LIBS} | grep gnutls | wc -l`
if test "$curl_uses_gnutls" -ne 0; then
AC_MSG_RESULT([yes])
AC_MSG_NOTICE([NOTE: curl linked with gnutls may be buggy, openssl recommended])
CURL_USES_GNUTLS=yes
else
AC_MSG_RESULT([no])
CURL_USES_GNUTLS=no
fi
else
AC_MSG_RESULT([no])
fi
AC_SUBST(CURL_LIBS)
AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_USES_GNUTLS)
if test -z "${CURL_LIBS}"; then
AC_MSG_NOTICE([*** curl library not found.])

17
apache2/configure vendored
View File

@@ -636,6 +636,7 @@ ac_includes_default="\
#endif"
ac_subst_vars='LTLIBOBJS
CURL_USES_GNUTLS
CURL_CFLAGS
CURL_LIBS
LUA_CFLAGS
@@ -5982,6 +5983,21 @@ $as_echo "no" >&6; }
$as_echo "$as_me: NOTE: curl library may be too old: $CURL_VERSION" >&6;}
fi
{ $as_echo "$as_me:$LINENO: checking if libcurl is linked with gnutls" >&5
$as_echo_n "checking if libcurl is linked with gnutls... " >&6; }
curl_uses_gnutls=`echo ${CURL_LIBS} | grep gnutls | wc -l`
if test "$curl_uses_gnutls" -ne 0; then
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:$LINENO: NOTE: curl linked with gnutls may be buggy, openssl recommended" >&5
$as_echo "$as_me: NOTE: curl linked with gnutls may be buggy, openssl recommended" >&6;}
CURL_USES_GNUTLS=yes
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
CURL_USES_GNUTLS=no
fi
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
@@ -5990,6 +6006,7 @@ fi
if test -z "${CURL_LIBS}"; then
{ $as_echo "$as_me:$LINENO: *** curl library not found." >&5
$as_echo "$as_me: *** curl library not found." >&6;}

10
apache2/mlogc-src/mlogc.c
View File

@@ -389,7 +389,7 @@ static void add_entry(const char *data, int start_worker)
error_log(LOG_DEBUG, NULL, "Queue locking thread mutex.");
if (APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mutex))) {
error_log(LOG_WARNING, NULL, "Queue waiting on thread mutex.");
error_log(LOG_DEBUG, NULL, "Queue waiting on thread mutex.");
apr_thread_mutex_lock(mutex);
}
@@ -478,7 +478,7 @@ static void transaction_log_init(void)
/* Put a lock in place to ensure exclusivity. */
error_log(LOG_DEBUG, NULL, "Transaction initialization locking global mutex.");
if (APR_STATUS_IS_EBUSY(apr_global_mutex_trylock(gmutex))) {
error_log(LOG_WARNING, NULL, "Transaction initialization waiting on global mutex.");
error_log(LOG_DEBUG, NULL, "Transaction initialization waiting on global mutex.");
apr_global_mutex_lock(gmutex);
}
@@ -582,7 +582,7 @@ static void transaction_checkpoint(void)
/* Put a lock in place to ensure exclusivity. */
error_log(LOG_DEBUG, NULL, "Checkpoint locking global mutex.");
if (APR_STATUS_IS_EBUSY(apr_global_mutex_trylock(gmutex))) {
error_log(LOG_WARNING, NULL, "Checkpoint waiting on global mutex.");
error_log(LOG_DEBUG, NULL, "Checkpoint waiting on global mutex.");
apr_global_mutex_lock(gmutex);
}
@@ -1532,7 +1532,7 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
error_log(LOG_DEBUG, thread, "Worker shutdown locking thread mutex.");
if (APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mutex))) {
error_log(LOG_WARNING, thread, "Worker shutdown waiting on thread mutex.");
error_log(LOG_DEBUG, thread, "Worker shutdown waiting on thread mutex.");
apr_thread_mutex_lock(mutex);
}
@@ -1583,7 +1583,7 @@ static void create_new_worker(int lock)
if (lock) {
error_log(LOG_DEBUG, NULL, "Worker creation locking thread mutex.");
if (APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mutex))) {
error_log(LOG_WARNING, NULL, "Worker creation waiting on thread mutex.");
error_log(LOG_DEBUG, NULL, "Worker creation waiting on thread mutex.");
apr_thread_mutex_lock(mutex);
}
}