summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-19 14:20:56 +0200
committerAnatol Belski <ab@php.net>2014-08-19 14:20:56 +0200
commitf07b41b465a5bb314a2d3b2bf309828e2dd7e299 (patch)
treebdec34d0f546d4c50f2ccbbffcde7d31ff91afbf
parent0e8c20edc90947f53f6495db7a18e1cd0fc4a8a5 (diff)
downloadphp-git-f07b41b465a5bb314a2d3b2bf309828e2dd7e299.tar.gz
fix incompatible types
-rw-r--r--ext/session/session.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index b03cfaa614..1a678b8ddb 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1266,12 +1266,13 @@ static void php_session_remove_cookie(TSRMLS_D) {
zend_llist *l = &SG(sapi_headers).headers;
zend_llist_element *next;
zend_llist_element *current;
- char *session_cookie, *e_session_name;
+ char *session_cookie;
+ zend_string *e_session_name;
int session_cookie_len, len = sizeof("Set-Cookie")-1;
e_session_name = php_url_encode(PS(session_name), strlen(PS(session_name)));
- spprintf(&session_cookie, 0, "Set-Cookie: %s=", e_session_name);
- efree(e_session_name);
+ spprintf(&session_cookie, 0, "Set-Cookie: %s=", e_session_name->val);
+ STR_FREE(e_session_name);
session_cookie_len = strlen(session_cookie);
current = l->head;