From: Shane Caraveo <shane@php.net>
Date: Mon, 30 Jun 2003 21:10:33 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.3RC2~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97422095edb5a23f0e265b4f0997d7e2ab1574ad;p=php

MFH
---

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index ca14e7a736..c74fc13469 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -149,7 +149,7 @@ PHP_MINIT_FUNCTION(browscap)
 {
 	char *browscap = INI_STR("browscap");
 
-	if (browscap) {
+	if (browscap && browscap[0]) {
 		zend_file_handle fh = {0};
 
 		if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t) browscap_entry_dtor, 1)==FAILURE) {
@@ -176,7 +176,9 @@ PHP_MINIT_FUNCTION(browscap)
  */
 PHP_MSHUTDOWN_FUNCTION(browscap)
 {
-	if (INI_STR("browscap")) {
+	char *browscap = INI_STR("browscap");
+
+	if (browscap && browscap[0]) {
 		zend_hash_destroy(&browser_hash);
 	}
 	return SUCCESS;
@@ -216,8 +218,9 @@ PHP_FUNCTION(get_browser)
 	zval **agent_name, **agent;
 	zval *found_browser_entry, *tmp_copy;
 	char *lookup_browser_name;
+	char *browscap = INI_STR("browscap");
 
-	if (!INI_STR("browscap")) {
+	if (!browscap || !browscap[0]) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set.");
 		RETURN_FALSE;
 	}