Fix zts

Author: bjori

php_phongo.c

@@ -178,7 +178,8 @@ PHONGO_API zval* phongo_throw_exception_from_bson_error_t(bson_error_t *error TS
 }
 static void php_phongo_log(mongoc_log_level_t log_level, const char *log_domain, const char *message, void *user_data)
 {
-	(void)user_data;TSRMLS_FETCH_FROM_CTX(user_data);
+	TSRMLS_FETCH_FROM_CTX(user_data);
+	(void)user_data;
 
 	switch(log_level) {
 	case MONGOC_LOG_LEVEL_ERROR:
@@ -772,6 +773,7 @@ ssize_t phongo_stream_poll (mongoc_stream_poll_t *streams, size_t nstreams, int3
 	php_pollfd *fds = NULL;
 	size_t i;
 	ssize_t rval = -1;
+	TSRMLS_FETCH();
 
 	fds = emalloc(sizeof(*fds) * nstreams);
 	for (i = 0; i < nstreams; i++) {
@@ -1198,7 +1200,7 @@ void php_phongo_result_to_zval(zval *retval, php_phongo_result_t *result) /* {{{
 } /* }}} */
 
 
-mongoc_client_t *php_phongo_make_mongo_client(const char *uri, zval *driverOptions) /* {{{ */
+mongoc_client_t *php_phongo_make_mongo_client(const char *uri, zval *driverOptions TSRMLS_DC) /* {{{ */
 {
 	php_stream_context       *ctx = NULL;
 	mongoc_client_t *client = mongoc_client_new(uri);

php_phongo.h

@@ -123,7 +123,7 @@ void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t
 void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t *write_concern);
 void php_phongo_result_to_zval(zval *retval, php_phongo_result_t *result);
 
-mongoc_client_t *php_phongo_make_mongo_client(const char *uri, zval *driverOptions);
+mongoc_client_t *php_phongo_make_mongo_client(const char *uri, zval *driverOptions TSRMLS_DC);
 void php_phongo_objectid_new_from_oid(zval *object, const bson_oid_t *oid TSRMLS_DC);
 void php_phongo_cursor_new_from_result(zval *object, php_phongo_result_t *result TSRMLS_DC);
 void php_phongo_cursor_id_new_from_id(zval *object, int64_t cursorid TSRMLS_DC);

src/MongoDB/Manager.c

@@ -76,7 +76,7 @@ PHP_METHOD(Manager, __construct)
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 
 
-	intern->client = php_phongo_make_mongo_client(uri, driverOptions);
+	intern->client = php_phongo_make_mongo_client(uri, driverOptions TSRMLS_CC);
 	if (!intern->client) {
 		phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "%s", "Failed to parse MongoDB URI");
 		return;
@@ -274,7 +274,7 @@ PHP_METHOD(Manager, getServers)
 
 		MAKE_STD_ZVAL(obj);
 
-		phongo_server_init(obj, intern->client, ((mongoc_server_description_t *)set->items[i].item)->id);
+		phongo_server_init(obj, intern->client, ((mongoc_server_description_t *)set->items[i].item)->id TSRMLS_CC);
 		add_next_index_zval(return_value, obj);
 	}
 }