com php-src: fix zts: ext/session/session.c
| From: | Anatol Belski | Date: | Wed, 22 Jan 2014 11:03:54 +0000 |
| Subject: | com php-src: fix zts: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75748@lists.php.net to get a copy of this message | ||
Commit: 34792280bcd2210784ba574d52fc3619cc06160d
Author: Anatol Belski <ab@php.net> Wed, 22 Jan 2014 12:03:54 +0100
Parents: 7bcf01f39abcc0baab2b37ff9799581e9f298b10
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=34792280bcd2210784ba574d52fc3619cc06160d
Log:
fix zts
Changed paths:
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index afc7eef..74a7f4a 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1188,7 +1188,7 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */
* It must be directly removed from SG(sapi_header) because sapi_add_header_ex()
* removes all of matching cookie. i.e. It deletes all of Set-Cookie headers.
*/
-static void php_session_remove_cookie() {
+static void php_session_remove_cookie(TSRMLS_D) {
sapi_header_struct *header;
zend_llist *l = &SG(sapi_headers).headers;
zend_llist_element *next;
@@ -1291,7 +1291,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */
smart_str_0(&ncookie);
- php_session_remove_cookie(); /* remove already sent session ID cookie */
+ php_session_remove_cookie(TSRMLS_C); /* remove already sent session ID cookie */
sapi_add_header_ex(ncookie.c, ncookie.len, 0, 0 TSRMLS_CC);
}
/* }}} */