diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2010-03-22 12:16:45 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2010-03-22 12:16:45 +0000 |
| commit | 995d15ebcc02c5b14496553ffe3957d8436eea0a (patch) | |
| tree | 1768f9de4990a58cdaacb95ed2a4fe3df6676362 /ext/session/session.c | |
| parent | 3488cd43be1282bad08030ec321daccbe62fadc1 (diff) | |
| download | php-git-995d15ebcc02c5b14496553ffe3957d8436eea0a.tar.gz | |
Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is on).
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 0ef856c9bf..6456f68163 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1343,7 +1343,11 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */ int nrand; int lensess; - PS(apply_trans_sid) = PS(use_trans_sid); + if (PS(use_only_cookies)) { + PS(apply_trans_sid) = 0; + } else { + PS(apply_trans_sid) = PS(use_trans_sid); + } switch (PS(session_status)) { case php_session_active: @@ -1445,7 +1449,7 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */ efree(PS(id)); PS(id) = NULL; PS(send_cookie) = 1; - if (PS(use_trans_sid)) { + if (PS(use_trans_sid) && !PS(use_only_cookies)) { PS(apply_trans_sid) = 1; } } @@ -1453,7 +1457,7 @@ PHPAPI void php_session_start(TSRMLS_D) /* {{{ */ php_session_initialize(TSRMLS_C); if (!PS(use_cookies) && PS(send_cookie)) { - if (PS(use_trans_sid)) { + if (PS(use_trans_sid) && !PS(use_only_cookies)) { PS(apply_trans_sid) = 1; } PS(send_cookie) = 0; |