httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Brian Havard" <bri...@kheldar.apana.org.au>
Subject Re: cvs commit: httpd-2.0/server util.c
Date Fri, 05 Jan 2001 02:47:21 GMT
ap_log_error() takes a server_rec *, not an apr_pool_t *. Did you mean to
change it to ap_log_perror() as well?


On 4 Jan 2001 21:53:29 -0000, dreid@apache.org wrote:

>dreid       01/01/04 13:53:29
>
>  Modified:    server   util.c
>  Log:
>  This stops a segfault on my machine where I haven't got a hostname for
>  the function to find.
>  
>  Revision  Changes    Path
>  1.87      +2 -2      httpd-2.0/server/util.c
>  
>  Index: util.c
>  ===================================================================
>  RCS file: /home/cvs/httpd-2.0/server/util.c,v
>  retrieving revision 1.86
>  retrieving revision 1.87
>  diff -u -r1.86 -r1.87
>  --- util.c	2000/12/20 16:43:47	1.86
>  +++ util.c	2001/01/04 21:53:27	1.87
>  @@ -1875,7 +1875,7 @@
>       if (gethostname(str, sizeof(str) - 1) != 0)
>   #endif
>       {
>  -        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_WARNING, 0, NULL,
>  +        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_WARNING, 0, a,
>                        "%s: gethostname() failed to determine ServerName",
>                        ap_server_argv0);
>       }
>  @@ -1900,7 +1900,7 @@
>       if (!server_hostname) 
>           server_hostname = apr_pstrdup(a, "127.0.0.1");
>   
>  -    ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO|APLOG_STARTUP, 0, NULL,
>  +    ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO|APLOG_STARTUP, 0, a,
>                    "%s: Could not determine the server's fully qualified "
>                    "domain name, using %s for ServerName",
>                    ap_server_argv0, server_hostname);
>  
>  
>  
>

-- 
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------


Mime
View raw message