Patch write-short-circuit-fix for Session related Bug #67694

Patch version 2014-08-23 14:18 UTC

Obsolete patches:

• write-short-circuit-fix, revision 2014-08-23 07:15 UTC

• 2014-08-23 14:18 UTC [diff to current]
• 2014-08-23 07:15 UTC [diff to current]

Developer: tyrael@php.net

diff --git a/ext/session/session.c b/ext/session/session.c
index d1a7a07..a59eeb5 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -519,6 +519,7 @@ static void php_session_initialize(TSRMLS_D) /* {{{ */
                /* Store read data's MD5 hash */
                PHP_MD5Init(&context);
                PHP_MD5Update(&context, val, vallen);
+               PHP_MD5Update(&context, PS(id), sizeof(PS(id)));
                PHP_MD5Final(PS(session_data_hash), &context);

                php_session_decode(val, vallen TSRMLS_CC);
@@ -553,6 +554,7 @@ static void php_session_save_current_state(TSRMLS_D) /* {{{ */
                                /* Generate data's MD5 hash */
                                PHP_MD5Init(&context);
                                PHP_MD5Update(&context, val, vallen);
+                               PHP_MD5Update(&context, PS(id), sizeof(PS(id)));
                                PHP_MD5Final(digest, &context);
                                /* Write only when save is required */
                                if (memcmp(digest, PS(session_data_hash), 16)) {