Modify a couple of calls to ap_log_error with a NULL server to use

ap_log_perror, and pass a pool.  The keeps us from seg faulting if the
error log hasn't been opened yet.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87565 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index d680ca7a673b6c6a8701c36a7e5717ae6db785ce..c788bc7a3af6fc67ad8a04fb4e74092b783ff8a6 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -1195,7 +1195,7 @@ static const char *set_document_root(cmd_parms *cmd, void *dummy,
     arg = ap_os_canonical_filename(cmd->pool, arg);
     if (/* TODO: ap_configtestonly && ap_docrootcheck && */ !ap_is_directory(arg)) {
        if (cmd->server->is_virtual) {
-           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
+           ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, cmd->pool,
                          "Warning: DocumentRoot [%s] does not exist",
                         arg);
        }

diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index 9ba7f6851ad7c0fdd26ff04e78a2b7326799c91b..e37598b09cb1ff8617a5c711533a705ee00c60bf 100644 (file)
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -186,8 +186,9 @@ static apr_status_t unload_module(void *data)
 
     /* unload the module space itself */
     if ((status = apr_dso_unload(modi->modp->dynamic_load_handle)) != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, NULL,
-                    "dso unload failure");
+        ap_log_perror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, 
+                      APR_GET_POOL(modi->modp->dynamic_load_handle),
+                     "dso unload failure");
         return status;
     }
 
@@ -263,7 +264,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
                          apr_dso_error(modhandle, my_error, sizeof(my_error)),
                          NULL);
     }
-    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
+    ap_log_perror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->pool,
                 "loaded module %s", modname);
 
     /*
@@ -347,7 +348,7 @@ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
 
 static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
 {
-    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
+    ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, cmd->pool, 
                  "WARNING: LoadFile not supported on this platform");
     return NULL;
 }
@@ -355,7 +356,7 @@ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
 static const char *load_module(cmd_parms *cmd, void *dummy, 
                               const char *modname, const char *filename)
 {
-    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
+    ap_log_perror(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, cmd->pool, 
                  "WARNING: LoadModule not supported on this platform");
     return NULL;
 }

diff --git a/server/listen.c b/server/listen.c
index 202f5b8d7b81d41554887d6b8b8a8df3f72cc433..440a50558f81a6f62f5e74dec1c8822f768ca220 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -90,7 +90,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
 
     stat = apr_setsocketopt(s, APR_SO_REUSEADDR, one);
     if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
-       ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
+       ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
                    "make_sock: for address %pI, setsockopt: (SO_REUSEADDR)", 
                      server->bind_addr);
        apr_close_socket(s);
@@ -99,7 +99,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
     
     stat = apr_setsocketopt(s, APR_SO_KEEPALIVE, one);
     if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
-       ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
+       ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
                    "make_sock: for address %pI, setsockopt: (SO_KEEPALIVE)", 
                      server->bind_addr);
        apr_close_socket(s);
@@ -128,7 +128,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
     if (send_buffer_size) {
        stat = apr_setsocketopt(s, APR_SO_SNDBUF,  send_buffer_size);
         if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, stat, NULL,
+            ap_log_perror(APLOG_MARK, APLOG_WARNING, stat, p,
                        "make_sock: failed to set SendBufferSize for "
                          "address %pI, using default", 
                          server->bind_addr);
@@ -141,7 +141,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
 #endif
 
     if ((stat = apr_bind(s, server->bind_addr)) != APR_SUCCESS) {
-       ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
+       ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
                      "make_sock: could not bind to address %pI", 
                      server->bind_addr);
        apr_close_socket(s);
@@ -149,7 +149,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
     }
 
     if ((stat = apr_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
-       ap_log_error(APLOG_MARK, APLOG_ERR, stat, NULL,
+       ap_log_perror(APLOG_MARK, APLOG_ERR, stat, p,
            "make_sock: unable to listen for connections on address %pI", 
                      server->bind_addr);
        apr_close_socket(s);
@@ -242,13 +242,13 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port)
     new->active = 0;
     if ((status = apr_getaddrinfo(&new->bind_addr, addr, APR_UNSPEC, port, 0, 
                                   process->pool)) != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL,
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
                      "alloc_listener: failed to set up sockaddr for %s", addr);
         return;
     }
     if ((status = apr_create_socket(&new->sd, new->bind_addr->sa.sin.sin_family, 
                                     SOCK_STREAM, process->pool)) != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL,
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
                      "alloc_listener: failed to get a socket for %s", addr);
         return;
     }