VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-29 12:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ap_log_error: Include text strings from apr-util in addition

Browse Source 
to apr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1920013 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2024-08-19 06:52:35 +00:00
parent c4f35264e9
commit fe4ade610c
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/log.c
View File

@ -25,6 +25,9 @@
#include "apr_general.h" /* for signal stuff */
#include "apr_strings.h"
#include "apr_errno.h"
#if (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
#include "apu_errno.h"
#endif
#include "apr_thread_proc.h"
#include "apr_lib.h"
#include "apr_signal.h"
@ -720,7 +723,19 @@ static int log_apr_status(const ap_errorlog_info *info, const char *arg,
len = apr_snprintf(buf, buflen, "(os 0x%08x)",
status - APR_OS_START_SYSERR);
}
#if (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if (status < APR_UTIL_START_STATUS) {
apr_strerror(status, buf + len, buflen - len);
}
else if (status < (APR_UTIL_START_STATUS + APR_UTIL_ERRSPACE_SIZE)) {
apu_strerror(status, buf + len, buflen - len);
}
else {
apr_strerror(status, buf + len, buflen - len);
}
#else
apr_strerror(status, buf + len, buflen - len);
#endif
len += strlen(buf + len);
return len;
}