lingering TSRM macros

php_http.c

@@ -106,11 +106,11 @@ static void php_http_globals_init_once(zend_php_http_globals *G)
 }
 
 #if 0
-static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
+static inline void php_http_globals_init(zend_php_http_globals *G)
 {
 }
 
-static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
+static inline void php_http_globals_free(zend_php_http_globals *G)
 {
 }
 #endif

php_http_client_curl.c

@@ -220,7 +220,6 @@ static int php_http_curle_progress_callback(void *ctx, double dltotal, double dl
 static int php_http_curle_seek_callback(void *userdata, curl_off_t offset, int origin)
 {
 	php_http_message_body_t *body = userdata;
-	TSRMLS_FETCH_FROM_CTX(body->ts);
 
 	if (!body) {
 		return 1;
@@ -603,14 +602,14 @@ static int compare_queue(php_http_client_enqueue_t *e, void *handle)
 	return handle == ((php_http_client_curl_handler_t *) e->opaque)->handle;
 }
 
-static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h TSRMLS_DC)
+static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h)
 {
 	php_http_message_t *response;
 	php_http_header_parser_t parser;
 	zval *zh;
 
-	response = php_http_message_init(NULL, 0, h->response.body TSRMLS_CC);
-	php_http_header_parser_init(&parser TSRMLS_CC);
+	response = php_http_message_init(NULL, 0, h->response.body);
+	php_http_header_parser_init(&parser);
 	while (h->response.headers.used) {
 		php_http_header_parser_state_t st = php_http_header_parser_parse(&parser,
 				&h->response.headers, PHP_HTTP_HEADER_PARSER_CLEANUP, &response->hdrs,
@@ -687,7 +686,7 @@ static void php_http_curlm_responsehandler(php_http_client_t *context)
 
 			if ((enqueue = php_http_client_enqueued(context, msg->easy_handle, compare_queue))) {
 				php_http_client_curl_handler_t *handler = enqueue->opaque;
-				php_http_message_t *response = php_http_curlm_responseparser(handler TSRMLS_CC);
+				php_http_message_t *response = php_http_curlm_responseparser(handler);
 
 				if (response) {
 					context->callback.response.func(context->callback.response.arg, context, &handler->queue, &response);
@@ -701,7 +700,7 @@ static void php_http_curlm_responsehandler(php_http_client_t *context)
 		int i = 0;
 
 		do {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(err[i].errorcode), err[i].errorbuffer, STR_PTR(err[i].url));
+			php_error_docref(NULL, E_WARNING, "%s; %s (%s)", curl_easy_strerror(err[i].errorcode), err[i].errorbuffer, STR_PTR(err[i].url));
 			if (err[i].url) {
 				efree(err[i].url);
 			}
@@ -1643,7 +1642,6 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_pipelining_bl(php_http_option_
 	CURLM *ch = curl->handle;
 	HashTable tmp_ht;
 	char **bl = NULL;
-	TSRMLS_FETCH_FROM_CTX(client->ts);
 
 	/* array of char *, ending with a NULL */
 	if (value && Z_TYPE_P(value) != IS_NULL) {
@@ -1714,7 +1712,7 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_use_eventloop(php_http_option_
 }
 #endif
 
-static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
+static void php_http_curlm_options_init(php_http_options_t *registry)
 {
 	php_http_option_t *opt;
 
@@ -1812,7 +1810,7 @@ static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *
 	}
 
 	if (rv != SUCCESS) {
-		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc));
+		php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc));
 	}
 	return rv;
 }
@@ -2019,7 +2017,7 @@ static ZEND_RESULT_CODE php_http_client_curl_handler_prepare(php_http_client_cur
 			curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, PHP_HTTP_INFO(msg).request.method);
 		}
 	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot use empty request method");
+		php_error_docref(NULL, E_WARNING, "Cannot use empty request method");
 		return FAILURE;
 	}
 
@@ -2414,7 +2412,6 @@ static int apply_available_options(zval *pDest, int num_args, va_list args, zend
 static ZEND_RESULT_CODE php_http_client_curl_getopt(php_http_client_t *h, php_http_client_getopt_opt_t opt, void *arg, void **res)
 {
 	php_http_client_enqueue_t *enqueue;
-	TSRMLS_FETCH_FROM_CTX(h->ts);
 
 	switch (opt) {
 	case PHP_HTTP_CLIENT_OPT_PROGRESS_INFO:
@@ -2436,11 +2433,11 @@ static ZEND_RESULT_CODE php_http_client_curl_getopt(php_http_client_t *h, php_ht
 		break;
 
 	case PHP_HTTP_CLIENT_OPT_AVAILABLE_OPTIONS:
-		zend_hash_apply_with_arguments(&php_http_curle_options.options TSRMLS_CC, apply_available_options, 1, *(HashTable **) res);
+		zend_hash_apply_with_arguments(&php_http_curle_options.options, apply_available_options, 1, *(HashTable **) res);
 		break;
 
 	case PHP_HTTP_CLIENT_OPT_AVAILABLE_CONFIGURATION:
-		zend_hash_apply_with_arguments(&php_http_curlm_options.options TSRMLS_CC, apply_available_options, 1, *(HashTable **) res);
+		zend_hash_apply_with_arguments(&php_http_curlm_options.options, apply_available_options, 1, *(HashTable **) res);
 		break;
 
 	default:

php_http_cookie.c

@@ -413,7 +413,7 @@ zend_object *php_http_cookie_object_clone(zval *obj)
 	return &new_obj->zo;
 }
 
-void php_http_cookie_object_free(zend_object *object TSRMLS_DC)
+void php_http_cookie_object_free(zend_object *object)
 {
 	php_http_cookie_object_t *obj = PHP_HTTP_OBJ(object, NULL);
 
@@ -926,7 +926,7 @@ static PHP_METHOD(HttpCookie, setFlags)
 	long flags = 0;
 	php_http_cookie_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -1024,9 +1024,9 @@ PHP_MINIT_FUNCTION(http_cookie)
 	php_http_cookie_object_handlers.clone_obj = php_http_cookie_object_clone;
 	php_http_cookie_object_handlers.free_obj = php_http_cookie_object_free;
 
-	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_COOKIE_PARSE_RAW TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("SECURE"), PHP_HTTP_COOKIE_SECURE TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("HTTPONLY"), PHP_HTTP_COOKIE_HTTPONLY TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_COOKIE_PARSE_RAW);
+	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("SECURE"), PHP_HTTP_COOKIE_SECURE);
+	zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("HTTPONLY"), PHP_HTTP_COOKIE_HTTPONLY);
 
 	return SUCCESS;
 }

php_http_cookie.h

@@ -63,7 +63,7 @@ typedef struct php_http_cookie_object {
 zend_object *php_http_cookie_object_new(zend_class_entry *ce);
 php_http_cookie_object_t *php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list);
 zend_object *php_http_cookie_object_clone(zval *this_ptr);
-void php_http_cookie_object_free(zend_object *object TSRMLS_DC);
+void php_http_cookie_object_free(zend_object *object);
 
 PHP_MINIT_FUNCTION(http_cookie);
 

php_http_encoding.c

@@ -634,7 +634,7 @@ static ZEND_RESULT_CODE dechunk_update(php_http_encoding_stream_t *s, const char
 					/*	if strtoul() stops at the beginning of the buffered data
 						there's something oddly wrong, i.e. bad input */
 					if (stop == ctx->buffer.data) {
-						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse chunk len from '%.*s'", (int) MIN(16, ctx->buffer.used), ctx->buffer.data);
+						php_error_docref(NULL, E_WARNING, "Failed to parse chunk len from '%.*s'", (int) MIN(16, ctx->buffer.used), ctx->buffer.data);
 						php_http_buffer_dtor(&tmp);
 						return FAILURE;
 					}

php_http_env.c

@@ -33,7 +33,7 @@ PHP_RSHUTDOWN_FUNCTION(http_env)
 	return SUCCESS;
 }
 
-void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC)
+void php_http_env_get_request_headers(HashTable *headers)
 {
 	php_http_arrkey_t key;
 	zval *hsv, *header;
@@ -574,7 +574,7 @@ static PHP_METHOD(HttpEnv, getResponseStatusForCode)
 	zend_long code;
 	const char *status;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code)) {
 		return;
 	}
 
@@ -672,7 +672,7 @@ static PHP_METHOD(HttpEnv, negotiateLanguage)
 	HashTable *supported;
 	zval *rs_array = NULL;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H|z", &supported, &rs_array)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "H|z", &supported, &rs_array)) {
 		return;
 	}
 	if (rs_array) {
@@ -757,7 +757,7 @@ static PHP_METHOD(HttpEnv, negotiate)
 	char *value_str, *sep_str = NULL;
 	size_t value_len, sep_len = 0;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "sH|s!z", &value_str, &value_len, &supported, &sep_str, &sep_len, &rs_array)) {
 		return;
 	}
 

php_http_env_request.c

@@ -172,7 +172,7 @@ static PHP_METHOD(HttpEnvRequest, __construct)
 		add_next_index_stringl(&mn, ZEND_STRL("get")); \
 		zend_fcall_info_init(&mn, 0, &fci, &fcc, NULL, NULL); \
 		zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args); \
-		zend_fcall_info_argp(&fci TSRMLS_CC, ZEND_NUM_ARGS(), args); \
+		zend_fcall_info_argp(&fci, ZEND_NUM_ARGS(), args); \
 		zend_fcall_info_call(&fci, &fcc, &rv, NULL); \
 		zend_fcall_info_args_clear(&fci, 1); \
 		efree(args); \

php_http_env_response.c

@@ -1096,7 +1096,7 @@ static ZEND_RESULT_CODE php_http_env_response_stream_finish(php_http_env_respons
 	php_stream_flush(ctx->stream);
 	if (ctx->chunked && ctx->chunked_filter) {
 		php_stream_filter_flush(ctx->chunked_filter, 1);
-		ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1 TSRMLS_CC);
+		ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1);
 	}
 
 	ctx->finished = 1;
@@ -1291,7 +1291,7 @@ static PHP_METHOD(HttpEnvResponse, isCachedByEtag)
 	char *header_name_str = NULL;
 	size_t header_name_len = 0;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &header_name_str, &header_name_len)) {
 		if (!header_name_str || !header_name_len) {
 			header_name_str = "If-None-Match";
 			header_name_len = lenof("If-None-Match");

php_http_header.c

@@ -19,13 +19,13 @@ ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTa
 	php_http_header_parser_state_t rs;
 
 	if (!php_http_buffer_from_string_ex(&buf, header, length)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not allocate buffer");
+		php_error_docref(NULL, E_WARNING, "Could not allocate buffer");
 		return FAILURE;
 	}
 
-	if (!php_http_header_parser_init(&ctx TSRMLS_CC)) {
+	if (!php_http_header_parser_init(&ctx)) {
 		php_http_buffer_dtor(&buf);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize header parser");
+		php_error_docref(NULL, E_WARNING, "Could not initialize header parser");
 		return FAILURE;
 	}
 
@@ -36,7 +36,7 @@ ZEND_RESULT_CODE php_http_header_parse(const char *header, size_t length, HashTa
 	return rs == PHP_HTTP_HEADER_PARSER_STATE_FAILURE ? FAILURE : SUCCESS;
 }
 
-void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg TSRMLS_DC)
+void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg)
 {
 	php_http_arrkey_t key;
 	zval *header, *single_header;
@@ -78,9 +78,9 @@ void php_http_header_to_callback(HashTable *headers, zend_bool crlf, php_http_pa
 	ZEND_HASH_FOREACH_END();
 }
 
-void php_http_header_to_string(php_http_buffer_t *str, HashTable *headers TSRMLS_DC)
+void php_http_header_to_string(php_http_buffer_t *str, HashTable *headers)
 {
-	php_http_header_to_callback(headers, 1, (php_http_pass_format_callback_t) php_http_buffer_appendf, str TSRMLS_CC);
+	php_http_header_to_callback(headers, 1, (php_http_pass_format_callback_t) php_http_buffer_appendf, str);
 }
 
 zend_string *php_http_header_value_array_to_string(zval *header)
@@ -173,7 +173,7 @@ PHP_METHOD(HttpHeader, unserialize)
 	char *serialized_str;
 	size_t serialized_len;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized_str, &serialized_len)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &serialized_str, &serialized_len)) {
 		HashTable ht;
 
 		zend_hash_init(&ht, 1, NULL, ZVAL_PTR_DTOR, 0);
@@ -311,7 +311,7 @@ PHP_METHOD(HttpHeader, parse)
 			zval_dtor(return_value);
 			RETURN_FALSE;
 		} else {
-			if (ce && instanceof_function(ce, php_http_header_class_entry TSRMLS_CC)) {
+			if (ce && instanceof_function(ce, php_http_header_class_entry)) {
 				php_http_arrkey_t key;
 				zval *val;
 

php_http_header_parser.c

@@ -122,7 +122,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars
 #endif
 		switch (php_http_header_parser_state_pop(parser)) {
 			case PHP_HTTP_HEADER_PARSER_STATE_FAILURE:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse headers");
+				php_error_docref(NULL, E_WARNING, "Failed to parse headers");
 				return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_FAILURE);
 
 			case PHP_HTTP_HEADER_PARSER_STATE_START: {
@@ -162,7 +162,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars
 
 					valid_len = strspn(parser->_key.str, PHP_HTTP_HEADER_NAME_CHARS);
 					if (valid_len != parser->_key.len) {
-						php_http_header_parser_error(valid_len, parser->_key.str, parser->_key.len, eol_str TSRMLS_CC);
+						php_http_header_parser_error(valid_len, parser->_key.str, parser->_key.len, eol_str);
 						PTR_SET(parser->_key.str, NULL);
 						return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_FAILURE);
 					}
@@ -172,7 +172,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars
 				} else if (eol_str || (flags & PHP_HTTP_HEADER_PARSER_CLEANUP)) {
 					/* neither reqeust/response line nor 'header:' string, or injected new line or NUL etc. */
 					php_http_buffer_fix(buffer);
-					php_http_header_parser_error(strspn(buffer->data, PHP_HTTP_HEADER_NAME_CHARS), buffer->data, buffer->used, eol_str TSRMLS_CC);
+					php_http_header_parser_error(strspn(buffer->data, PHP_HTTP_HEADER_NAME_CHARS), buffer->data, buffer->used, eol_str);
 					return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_FAILURE);
 				} else {
 					/* keep feeding */
@@ -245,7 +245,7 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars
 
 					/* check for truncation */
 					if (valid_len != parser->_val.len) {
-						php_http_header_parser_error(valid_len, parser->_val.str, parser->_val.len, NULL TSRMLS_CC);
+						php_http_header_parser_error(valid_len, parser->_val.str, parser->_val.len, NULL);
 
 						PTR_SET(parser->_key.str, NULL);
 						PTR_SET(parser->_val.str, NULL);
@@ -285,7 +285,6 @@ php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_pars
 php_http_header_parser_state_t php_http_header_parser_parse_stream(php_http_header_parser_t *parser, php_http_buffer_t *buf, php_stream *s, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg)
 {
 	php_http_header_parser_state_t state = PHP_HTTP_HEADER_PARSER_STATE_START;
-	TSRMLS_FETCH_FROM_CTX(parser->ts);
 
 	if (!buf->data) {
 		php_http_buffer_resize_ex(buf, 0x1000, 1, 0);

php_http_info.c

@@ -69,7 +69,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		return NULL;
 	}
 
-	info = php_http_info_init(info TSRMLS_CC);
+	info = php_http_info_init(info);
 
 	/* and nothing than SPACE or NUL after HTTP/X.x */
 	if (!php_http_version_parse(&info->http.version, http)

php_http_message.c

@@ -86,7 +86,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
 			php_http_env_get_response_headers(&message->hdrs);
 			if (php_output_get_level()) {
 				if (php_output_get_status() & PHP_OUTPUT_SENT) {
-					php_error_docref(NULL, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(TSRMLS_C), php_output_get_start_lineno(TSRMLS_C));
+					php_error_docref(NULL, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(), php_output_get_start_lineno());
 					goto error;
 				} else if (SUCCESS != php_output_get_contents(&tval)) {
 					php_error_docref(NULL, E_WARNING, "Could not fetch response body");
@@ -818,7 +818,7 @@ php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce,
 	return o;
 }
 
-zend_object *php_http_message_object_clone(zval *this_ptr TSRMLS_DC)
+zend_object *php_http_message_object_clone(zval *this_ptr)
 {
 	php_http_message_object_t *new_obj = NULL;
 	php_http_message_object_t *old_obj = PHP_HTTP_OBJ(NULL, this_ptr);
@@ -1409,7 +1409,7 @@ static PHP_METHOD(HttpMessage, setResponseCode)
 	zend_bool strict = 1;
 	php_http_message_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|b", &code, &strict), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "l|b", &code, &strict), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
@@ -1460,7 +1460,7 @@ static PHP_METHOD(HttpMessage, setResponseStatus)
 	size_t status_len;
 	php_http_message_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &status, &status_len), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -1710,7 +1710,7 @@ static PHP_METHOD(HttpMessage, unserialize)
 			obj->message = msg;
 		} else {
 			obj->message = php_http_message_init(NULL, 0, NULL);
-			php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not unserialize http\\Message");
+			php_error_docref(NULL, E_ERROR, "Could not unserialize http\\Message");
 		}
 	}
 }
@@ -1832,7 +1832,7 @@ static PHP_METHOD(HttpMessage, count)
 {
 	zend_long count_mode = -1;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &count_mode)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &count_mode)) {
 		php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);