cvs: php4 /ext/session php_session.h session.c /main output.c

sas Sun Aug 5 10:36:51 2001 EDT Modified files: /php4/ext/session php_session.h session.c /php4/main output.c Log: further tsrm cleanup Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.47 php4/ext/session/php_session.h:1.48 --- php4/ext/session/php_session.h:1.47 Sat Jul 28 07:36:12 2001 +++ php4/ext/session/php_session.h Sun Aug 5 10:36:49 2001 @@ -144,8 +144,8 @@ { #x, PS_SERIALIZER_ENCODE_NAME(x), PS_SERIALIZER_DECODE_NAME(x) } #ifdef TRANS_SID -void session_adapt_uris(const char *, size_t, char **, size_t *); -void session_adapt_url(const char *, size_t, char **, size_t *); +void session_adapt_uris(const char *, size_t, char **, size_t * TSRMLS_DC); +void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC); void session_adapt_flush(int (*)(const char *, uint)); #else #define session_adapt_uris(a,b,c,d) do { } while(0) Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.229 php4/ext/session/session.c:1.230 --- php4/ext/session/session.c:1.229 Sat Aug 4 21:42:40 2001 +++ php4/ext/session/session.c Sun Aug 5 10:36:50 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.229 2001/08/05 01:42:40 zeev Exp $ */ +/* $Id: session.c,v 1.230 2001/08/05 14:36:50 sas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -420,10 +420,9 @@ return SUCCESS; } -static void php_session_track_init(void) +static void php_session_track_init(TSRMLS_D) { zval **old_vars = NULL; - TSRMLS_FETCH(); if (zend_hash_find(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), (void **)&old_vars) == SUCCESS && Z_TYPE_PP(old_vars) == IS_ARRAY) { PS(http_session_vars) = *old_vars; @@ -450,7 +449,7 @@ static void php_session_decode(const char *val, int vallen TSRMLS_DC) { - php_session_track_init(); + php_session_track_init(TSRMLS_C); if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) { php_session_destroy(TSRMLS_C); php_error(E_WARNING, "Failed to decode session object. Session has been destroyed."); @@ -590,13 +589,12 @@ ubuf[n] = '\0'; } -static void last_modified(void) +static void last_modified(TSRMLS_D) { const char *path; struct stat sb; char buf[MAX_STR + 1]; - TSRMLS_FETCH(); - + path = SG(request_info).path_translated; if (path) { if (VCWD_STAT(path, &sb) == -1) { @@ -625,7 +623,7 @@ sprintf(buf, "Cache-Control: public, max-age=%ld", PS(cache_expire) * 60); ADD_COOKIE(buf); - last_modified(); + last_modified(TSRMLS_C); } CACHE_LIMITER_FUNC(private) @@ -636,7 +634,7 @@ sprintf(buf, "Cache-Control: private, max-age=%ld, pre-check=%ld", PS(cache_expire) * 60, PS(cache_expire) * 60); ADD_COOKIE(buf); - last_modified(); + last_modified(TSRMLS_C); } CACHE_LIMITER_FUNC(nocache) @@ -1270,18 +1268,14 @@ /* }}} */ #ifdef TRANS_SID -void session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen) +void session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen TSRMLS_DC) { - TSRMLS_FETCH(); - if (PS(define_sid) && (PS(session_status) == php_session_active)) *new = url_adapt_ext_ex(src, srclen, PS(session_name), PS(id), newlen); } -void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen) +void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen TSRMLS_DC) { - TSRMLS_FETCH(); - if (PS(define_sid) && (PS(session_status) == php_session_active)) *new = url_adapt_single_url(url, urllen, PS(session_name), PS(id), newlen); } Index: php4/main/output.c diff -u php4/main/output.c:1.70 php4/main/output.c:1.71 --- php4/main/output.c:1.70 Sat Aug 4 21:42:44 2001 +++ php4/main/output.c Sun Aug 5 10:36:51 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.70 2001/08/05 01:42:44 zeev Exp $ */ +/* $Id: output.c,v 1.71 2001/08/05 14:36:51 sas Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -459,7 +459,7 @@ return 0; } if (BG(use_trans_sid)) { - session_adapt_uris(str, str_length, &newstr, &new_length); + session_adapt_uris(str, str_length, &newstr, &new_length TSRMLS_CC); } if (newstr) {