summaryrefslogtreecommitdiff
path: root/sapi/cgi/fastcgi.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
committerAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
commit4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch)
treec9628d91eae3f580f9ebd73d2372e4c9089b2e00 /sapi/cgi/fastcgi.c
parent79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff)
parentdec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff)
downloadphp-git-POST_NATIVE_TLS_MERGE.tar.gz
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'sapi/cgi/fastcgi.c')
-rw-r--r--sapi/cgi/fastcgi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index 7925f87562..1f5ee50d03 100644
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -323,13 +323,13 @@ static char *fcgi_hash_get(fcgi_hash *h, unsigned int hash_value, char *var, uns
return NULL;
}
-static void fcgi_hash_apply(fcgi_hash *h, fcgi_apply_func func, void *arg TSRMLS_DC)
+static void fcgi_hash_apply(fcgi_hash *h, fcgi_apply_func func, void *arg)
{
fcgi_hash_bucket *p = h->list;
while (p) {
if (EXPECTED(p->val != NULL)) {
- func(p->var, p->var_len, p->val, p->val_len, arg TSRMLS_CC);
+ func(p->var, p->var_len, p->val, p->val_len, arg);
}
p = p->list_next;
}
@@ -1496,9 +1496,9 @@ char* fcgi_quick_putenv(fcgi_request *req, char* var, int var_len, unsigned int
}
}
-void fcgi_loadenv(fcgi_request *req, fcgi_apply_func func, zval *array TSRMLS_DC)
+void fcgi_loadenv(fcgi_request *req, fcgi_apply_func func, zval *array)
{
- fcgi_hash_apply(&req->env, func, array TSRMLS_CC);
+ fcgi_hash_apply(&req->env, func, array);
}
#ifdef _WIN32