com php-src: fix incompatible types: ext/session/session.c
| From: | Anatol Belski | Date: | Tue, 19 Aug 2014 12:20:56 +0000 |
| Subject: | com php-src: fix incompatible types: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80611@lists.php.net to get a copy of this message | ||
Commit: f07b41b465a5bb314a2d3b2bf309828e2dd7e299
Author: Anatol Belski <ab@php.net> Tue, 19 Aug 2014 14:20:56 +0200
Parents: 0e8c20edc90947f53f6495db7a18e1cd0fc4a8a5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f07b41b465a5bb314a2d3b2bf309828e2dd7e299
Log:
fix incompatible types
Changed paths:
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index b03cfaa..1a678b8 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;