diff options
| author | Anatol Belski <ab@php.net> | 2014-08-20 00:34:17 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-20 00:34:17 +0200 |
| commit | 53a8d8e6273b2e73c0cdfeb814f9518de4bb796d (patch) | |
| tree | 716cd5cfa5b98c292858f0319b5b6bf201f459a9 /ext/session/session.c | |
| parent | 476bdbf85b86a3664ac81b5bca3e3899475f16de (diff) | |
| parent | 1ec93f8069cbbcfcf825a433f4835830391801a6 (diff) | |
| download | php-git-53a8d8e6273b2e73c0cdfeb814f9518de4bb796d.tar.gz | |
Merge remote-tracking branch 'php/master'
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index a7b79c2300..8811a08caf 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; |