Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is on).

diff --git a/NEWS b/NEWS
index c7f7594363c9485c8204770d5c21ad0e24437cd1..1cc3b4a14b05f9c49c4a23258d3e44b19e7dc82c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
 - Fixed a NULL pointer dereference when processing invalid XML-RPC
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 
+- Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is
+  on). (Ilia, j dot jeising at gmail dot com)
 - Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam)
 - Fixed bug #51237 (milter SAPI crash on startup). (igmar at palsenberg dot com)
 - Fixed bug #51213 (pdo_mssql is trimming value of the money column). (Ilia,

diff --git a/ext/session/session.c b/ext/session/session.c
index 59ffd73a3ff49fd1a4dc6d714c17b422aa0319b7..4318aba023ad90ed30113c85c4377ddb8ce04261 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1261,7 +1261,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:
@@ -1363,7 +1367,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;
                }
        }
@@ -1371,7 +1375,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;