From 479a47d8af09175abd9e241f54d16a8652a70b3b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?=
 <cataphract@php.net>
Date: Fri, 3 Jun 2011 09:39:45 +0000
Subject: [PATCH] Merge of fix for bug #54918 (r311745, scottmac) to 5.3.

---
 ext/standard/browscap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 19cf315b1c..a81bd86c0e 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -334,18 +334,18 @@ PHP_MINIT_FUNCTION(browscap) /* {{{ */
 {
 	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;
 }
 /* }}} */
-- 
2.40.0