Commit 0caa8a4f authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Fix a potential segfault on all platforms. David Reid fixed this for

BEOS, but this could actually happen on any platform, so we should
be safe and protect ourselves.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88080 13f79535-47bb-0310-9956-ffa450edef68
parent 940ec287
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
Changes with Apache 2.0b1

  *) Fix a potential seg fault on all platforms.  David Reid fixed this
     on BEOS, but the problem could happen anywhere, so we don't want
     to #ifdef it. [Cliff Woolley <cliffwoolley@yahoo.com>]
 
  *) Add new LogFormat directive, %D, to log time it takes to serve a
     request in microseconds. [Bill Stoddard]

+1 −5
Original line number Diff line number Diff line
@@ -1788,11 +1788,7 @@ char *ap_get_local_host(apr_pool_t *a)
        if ((!(p = gethostbyname(str))) 
            || (!(server_hostname = find_fqdn(a, p)))) {
            /* Recovery - return the default servername by IP: */
#ifndef BEOS
            if (p->h_addr_list[0]) {
#else
            if (p) {
#endif
            if (p && p->h_addr_list[0]) {
                apr_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
	        server_hostname = apr_pstrdup(a, str);
                /* We will drop through to report the IP-named server */