PHPC-236: 5.3-zts build broken

bjori · bjori · commit 930ff02098a9 · 2015-04-10T15:51:48.000-07:00
diff --git a/phongo_compat.h b/phongo_compat.h
@@ -89,3 +89,11 @@
 # endif
 #endif
 
+#if PHP_VERSION_ID < 50400
+# define GET_DEFAULT_CONTEXT() \
+	ctx = FG(default_context) ? FG(default_context) : php_stream_context_alloc()
+#else
+# define GET_DEFAULT_CONTEXT() \
+	ctx = FG(default_context) ? FG(default_context) : php_stream_context_alloc(TSRMLS_C)
+#endif
+
diff --git a/php_phongo.c b/php_phongo.c
@@ -1307,7 +1307,7 @@ mongoc_client_t *php_phongo_make_mongo_client(const char *uri, zval *driverOptio
 	if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "context", strlen("context") + 1, (void**)&tmp) == SUCCESS) {
 		ctx = php_stream_context_from_zval(*tmp, 0);
 	} else {
-		ctx = FG(default_context) ? FG(default_context) : php_stream_context_alloc(TSRMLS_C);
+		GET_DEFAULT_CONTEXT();
 	}
 	muri = mongoc_client_get_uri(client);
 

Original file line number	Diff line number	Diff line change
`@@ -1307,7 +1307,7 @@ mongoc_client_t php_phongo_make_mongo_client(const char uri, zval *driverOptio`
`1307`	`1307`	`if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "context", strlen("context") + 1, (void**)&tmp) == SUCCESS) {`
`1308`	`1308`	`ctx = php_stream_context_from_zval(*tmp, 0);`
`1309`	`1309`	`} else {`
`1310`		`- ctx = FG(default_context) ? FG(default_context) : php_stream_context_alloc(TSRMLS_C);`
	`1310`	`+ GET_DEFAULT_CONTEXT();`
`1311`	`1311`	`}`
`1312`	`1312`	`muri = mongoc_client_get_uri(client);`
`1313`	`1313`