diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-02-26 16:32:01 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-02-26 16:32:01 +0100 |
| commit | 46bdc28bf4c492a6596ca6245f61d20dd776ed9a (patch) | |
| tree | d597157588cf10a14ed7a7404326473c4fa606f3 /os | |
| parent | Axed C++ comments and tabs. (diff) | |
| download | apache2-46bdc28bf4c492a6596ca6245f61d20dd776ed9a.tar.xz apache2-46bdc28bf4c492a6596ca6245f61d20dd776ed9a.zip | |
fix some logging calls to include the server_rec
(and even the conn_rec in a couple of places)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074871 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
| -rw-r--r-- | os/bs2000/os.c | 2 | ||||
| -rw-r--r-- | os/unix/unixd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/os/bs2000/os.c b/os/bs2000/os.c index d75ecb385f..d0f2164594 100644 --- a/os/bs2000/os.c +++ b/os/bs2000/os.c @@ -124,7 +124,7 @@ pid_t os_fork(const char *user) pid = ufork(username); if (pid == -1 && errno == EPERM) { ap_log_error(APLOG_MARK, APLOG_EMERG, errno, - NULL, "ufork: Possible mis-configuration " + ap_server_conf, "ufork: Possible mis-configuration " "for user %s - Aborting.", user); exit(1); } diff --git a/os/unix/unixd.c b/os/unix/unixd.c index e8677d1383..db5d328e47 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -307,7 +307,7 @@ AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr, #ifdef _OSD_POSIX apr_os_sock_get(&sockdes, csd); if (sockdes >= FD_SETSIZE) { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, "new file descriptor %d is too large; you probably need " "to rebuild Apache with a larger FD_SETSIZE " "(currently %d)", @@ -535,7 +535,7 @@ pid_t os_fork(const char *user) pid = ufork(username); if (pid == -1 && errno == EPERM) { ap_log_error(APLOG_MARK, APLOG_EMERG, errno, - NULL, "ufork: Possible mis-configuration " + ap_server_conf, "ufork: Possible mis-configuration " "for user %s - Aborting.", user); exit(1); } |