suppress sending of cookies if session id already came

from a non-cookie source

diff --git a/ext/session/session.c b/ext/session/session.c
index d373b5a75715ef76e677b02cf4ac876ab500a3fb..81a4eb0a811a59d9322ef97773c1f31b8bfb54b0 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -832,6 +832,7 @@ static void php_session_start(PSLS_D)
                                zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
                                        lensess + 1, (void **) &ppid) == SUCCESS) {
                        PPID2SID;
+                       send_cookie = 0;
                }
 
                if (!PS(id) &&
@@ -841,6 +842,7 @@ static void php_session_start(PSLS_D)
                                zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
                                        lensess + 1, (void **) &ppid) == SUCCESS) {
                        PPID2SID;
+                       send_cookie = 0;
                }
        }