[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard browscap.c

[Shane Caraveo]

shane           Mon Jun 30 17:10:33 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/standard       browscap.c 
  Log:
  MFH
  
  
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.60.2.12 
php-src/ext/standard/browscap.c:1.60.2.13
--- php-src/ext/standard/browscap.c:1.60.2.12   Fri May 30 21:37:43 2003
+++ php-src/ext/standard/browscap.c     Mon Jun 30 17:10:33 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: browscap.c,v 1.60.2.12 2003/05/31 01:37:43 sniper Exp $ */
+/* $Id: browscap.c,v 1.60.2.13 2003/06/30 21:10:33 shane Exp $ */
 
 #include "php.h"
 #include "php_regex.h"
@@ -149,7 +149,7 @@
 {
        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_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 @@
        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;
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php