X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_misc.c;h=4adab8112923c0dd2569b97f02de8c2fe2aa7310;hp=ff0c02475d204075ef18547792d50de54cd5ee9e;hb=3e3f308c565cea1b153717f213d61731aef2fcf4;hpb=03f11ce599fa5a89148d588caf6ccec7f939e9d4

diff --git a/php_http_misc.c b/php_http_misc.c
index ff0c024..4adab81 100644
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -113,9 +113,9 @@ char *php_http_pretty_key(register char *key, size_t key_len, zend_bool uctitle,
 }
 
 
-size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC)
+size_t php_http_boundary(char *buf, size_t buf_len)
 {
-	return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time(TSRMLS_C) * php_combined_lcg(TSRMLS_C));
+	return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time() * php_combined_lcg());
 }
 
 int php_http_select_str(const char *cmp, int argc, ...)
@@ -163,6 +163,7 @@ unsigned php_http_array_list(HashTable *ht, unsigned argc, ...)
 
 void php_http_array_copy_strings(zval *zp)
 {
+	Z_TRY_ADDREF_P(zp);
 	convert_to_string_ex(zp);
 }
 
@@ -226,7 +227,7 @@ int php_http_array_apply_merge_func(zval *value, int num_args, va_list args, zen
 			convert_to_string_ex(value);
 		}
 
-		Z_ADDREF_P(value);
+		Z_TRY_ADDREF_P(value);
 
 		if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->key) {
 			key = php_http_pretty_key(estrndup(hash_key->key->val, hash_key->key->len), hash_key->key->len, 1, 1);
@@ -250,8 +251,8 @@ size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len)
 	zval zdata;
 
 	ZVAL_STRINGL(&zdata, str, len);
-	if (SUCCESS == zend_fcall_info_argn(&fcd->fci TSRMLS_CC, 2, &fcd->fcz, &zdata)) {
-		zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL TSRMLS_CC);
+	if (SUCCESS == zend_fcall_info_argn(&fcd->fci, 2, &fcd->fcz, &zdata)) {
+		zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL);
 		zend_fcall_info_args_clear(&fcd->fci, 0);
 	}
 	zval_ptr_dtor(&zdata);