archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix trans-sid.

Browse source 
Still need to figure out how to turn trans-sid only when sessions
are actually used.
This commit is contained in:
Zeev Suraski 2001-08-26 11:14:35 +00:00
parent 70c581b820
commit dc9769ea96
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/session/php_session.h
View file

@ -144,7 +144,6 @@ typedef struct ps_serializer_struct {
#define PS_SERIALIZER_ENTRY(x) \
{ #x, PS_SERIALIZER_ENCODE_NAME(x), PS_SERIALIZER_DECODE_NAME(x) }
void session_adapt_uris(const char *, size_t, char **, size_t *,zend_bool TSRMLS_DC);
void session_adapt_url(const char *, size_t, char **, size_t * TSRMLS_DC);
void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash TSRMLS_DC);

22
ext/session/session.c
View file

@ -83,6 +83,17 @@ php_ps_globals ps_globals;
static ps_module *_php_find_ps_module(char *name TSRMLS_DC);
static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC);
static int session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen, zend_bool do_flush TSRMLS_DC)
{
if (PS(define_sid) && (PS(session_status) == php_session_active)) {
*new = url_adapt_ext_ex(src, srclen, PS(session_name), PS(id), newlen, do_flush TSRMLS_CC);
return SUCCESS;
} else {
return FAILURE;
}
}
static void php_session_output_handler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
{
zend_bool do_flush;
@ -90,7 +101,9 @@ static void php_session_output_handler(char *output, uint output_len, char **han
if (mode&PHP_OUTPUT_HANDLER_END) {
do_flush=1;
}
session_adapt_uris(output, output_len, handled_output, handled_output_len, do_flush TSRMLS_CC);
if (session_adapt_uris(output, output_len, handled_output, handled_output_len, do_flush TSRMLS_CC)==FAILURE) {
*handled_output = NULL;
}
}
@ -1308,13 +1321,6 @@ PHP_FUNCTION(session_destroy)
}
/* }}} */
void session_adapt_uris(const char *src, size_t srclen, char **new, size_t *newlen, zend_bool do_flush TSRMLS_DC)
{
if (PS(define_sid) && (PS(session_status) == php_session_active)) {
*new = url_adapt_ext_ex(src, srclen, PS(session_name), PS(id), newlen, do_flush TSRMLS_CC);
}
}
void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen TSRMLS_DC)
{
if (PS(define_sid) && (PS(session_status) == php_session_active)) {