Added a sanity check (hopefuly will fix bug #20109). According to

http://developer.netscape.com/docs/manuals/enterprise/40/nsapi/05_nsapi.htm#551539
util_hostname() can return a NULL value.

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 522df344797df9eb88eca047ca26c06ff6c7aa19..f2e4efacb61bbc212250dfa0e1c7315d4aaa6295 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -318,7 +318,9 @@ sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC)
        }
        sprintf(buf, "%d", conf_getglobals()->Vport);
        php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC );
-       php_register_variable("SERVER_NAME", util_hostname(), track_vars_array TSRMLS_CC );
+       if ((value = util_hostname())) {
+               php_register_variable("SERVER_NAME", value, track_vars_array TSRMLS_CC );
+       }       
        php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array TSRMLS_CC );
        php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC );
 /*     php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array TSRMLS_CC ); */