svn: /php/php-src/branches/PHP_5_3/ext/standard/ browscap.c

cataphract Fri, 03 Jun 2011 09:39:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311764 Log: Merge of fix for bug #54918 (r311745, scottmac) to 5.3. Bug: http://bugs.php.net/54918 (Closed) browscap issues Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/browscap.c Modified: php/php-src/branches/PHP_5_3/ext/standard/browscap.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/browscap.c 2011-06-03 08:58:52 UTC (rev 311763) +++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c 2011-06-03 09:39:45 UTC (rev 311764) @@ -334,18 +334,18 @@ { char *browscap = INI_STR("browscap"); - if (browscap && browscap[0]) { - if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { - return FAILURE; - } - } - #ifdef ZTS ts_allocate_id(&browscap_globals_id, sizeof(browser_data), (ts_allocate_ctor)browscap_globals_ctor, NULL); #endif /* ctor call not really needed for non-ZTS */ + if (browscap && browscap[0]) { + if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) { + return FAILURE; + } + } + return SUCCESS; } /* }}} */