diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2002-10-26 22:00:36 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2002-10-26 22:00:36 +0000 |
| commit | d5870ef54440591433e16ef5439424b7e92c155d (patch) | |
| tree | 5c95d7e69877b1c86e9a9941001a26a6c48ce209 /sapi/nsapi/nsapi.c | |
| parent | 65b79b3595ad5c5b982fc34ebb0c1006476c1f82 (diff) | |
| download | php-git-d5870ef54440591433e16ef5439424b7e92c155d.tar.gz | |
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.
Diffstat (limited to 'sapi/nsapi/nsapi.c')
| -rw-r--r-- | sapi/nsapi/nsapi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index 522df34479..f2e4efacb6 100644 --- 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 ); */ |